Frappe PR Bot
aa04051416
fix: patches were breaking during migration ( #27213 )
...
* fix: patches were breaking during migration (#27200 )
* fix: patches were breaking during migrating
* fix: patches were breaking during migration
(cherry picked from commit 743375748930501401+shadrak98@users.noreply.github.com >
Co-authored-by: Ankush Menat <ankush@iwebnotes.com >
2021-08-30 18:51:10 +05:30
Frappe PR Bot
ee76032fca
fix: patches were breaking while migrating ( #27206 )
...
* fix: patches were breaking while migrating (#27195 )
* fix: patches were breaking while migrating
* fix: Removed duplicate function
Co-authored-by: Nabin Hait <nabinhait@gmail.com >
(cherry picked from commit 17e0fa7a8b30501401+shadrak98@users.noreply.github.com >
Co-authored-by: Ankush Menat <ankush@iwebnotes.com >
2021-08-28 14:54:14 +05:30
Frappe PR Bot
85fe755f89
fix: operation time auto set to zero ( #27189 )
...
* fix: operation time auto set to zero (#27188 )
(cherry picked from commit e6799d78efrohitw1991@gmail.com >
2021-08-27 11:02:37 +05:30
Frappe PR Bot
03039b9e00
fix: use Stripe's Price API for plan-price information ( #27183 )
...
* fix: use Stripe's Price API for plan-price information (#26107 )
* fix: use Stripe's new Plan API for price information
* patch: use inbuilt function to rename field
* fix: patch call
Co-authored-by: Ankush Menat <ankush@iwebnotes.com >
Co-authored-by: Nabin Hait <nabinhait@gmail.com >
(cherry picked from commit 16eed07a0fAlchez@users.noreply.github.com >
Co-authored-by: Ankush Menat <ankush@iwebnotes.com >
Co-authored-by: Afshan <33727827+AfshanKhan@users.noreply.github.com >
2021-08-27 10:45:34 +05:30
Frappe PR Bot
31561c3f9a
fix: cannot reconcile bank transactions against internal transfer payment entries ( #27148 )
...
* fix: cannot reconcile bank transactions against internal transfer payment entries (#26932 )
* fix: Only set Clearance Date for Payment Entries of type Internal Transfer if both Transactions have been reconciled
* fix: Reset clearance_date for intra-company Payment Entries that have only been reconciled with one Bank Transaction
* fix: indentation and args
Co-authored-by: Saqib <nextchamp.saqib@gmail.com >
Co-authored-by: Nabin Hait <nabinhait@gmail.com >
(cherry picked from commit 842ceb1301ganga.manoj98@gmail.com >
Co-authored-by: Nabin Hait <nabinhait@gmail.com >
2021-08-26 19:57:56 +05:30
Anuja Pawar
8220117500
feat(regional): South Africa VAT Audit Report ( #27017 )
...
* feat: SA VAT Report
* fix: added party column and fixed permissions
Co-authored-by: Deepesh Garg <42651287+deepeshgarg007@users.noreply.github.com >
Co-authored-by: Afshan <33727827+AfshanKhan@users.noreply.github.com >
Co-authored-by: Nabin Hait <nabinhait@gmail.com >
2021-08-24 22:02:05 +05:30
Mohammad Hussain Nagaria
24b2a31581
feat: Employee reminders ( #25735 )
...
* feat: Add reminders section to HR Settings
* refactor: Extract generic function for getting Employees
* feat: Employee Work Anniversary Reminder
* feat: Daily Holiday Reminder
* fix: Unnecessary params and replace [] with .get()
* test: Daily Holiday Reminders
* test: is_holiday basic tests
* refactor: Move employee reminders code to separate module
* feat: Add advance reminder to HR settings
* feat: Advance Holiday Reminders
* refactor: get_holidays_for_employee
* feat: Email holiday reminders in advance + tests
* fix: Remove unused import
* refactor: HR Setting Reminder Section
* refactor: Remove Daily Holiday Reminders feat
* feat: Reminder miss warning
* fix: Failing test and function name change
* chore: Add patch for field rename
* chore: Rename frequency label
* fix: Failing patch test
* fix: sider and removed description of fields
* fix: email alignment
Co-authored-by: pateljannat <pateljannat2308@gmail.com >
Co-authored-by: Jannat Patel <31363128+pateljannat@users.noreply.github.com >
2021-08-24 19:43:43 +05:30
Syed Mujeer Hashmi
1604b6cc63
fix: Allow backdated discharge for inpatient ( #25124 )
...
* fix: Allow backdated discharge for inpatient
The system is not flexible enough to allow backdated patient discharge.
Signed-off-by: Syed Mujeer Hashmi <mujeerhashmi@4csolutions.in >
* fix: Sider issues and test cases related to this patch
Signed-off-by: Syed Mujeer Hashmi <mujeerhashmi@4csolutions.in >
Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com >
Co-authored-by: Jannat Patel <31363128+pateljannat@users.noreply.github.com >
2021-08-24 18:35:59 +05:30
Deepesh Garg
2aa0daf47b
Merge branch 'version-13-hotfix' of https://github.com/frappe/erpnext into export_type_mandatory_v13
2021-08-16 14:40:13 +05:30
Deepesh Garg
5fddd27cab
fix: Add mandatory depends on condition for export type field
2021-08-16 14:34:40 +05:30
Frappe PR Bot
a7e0805039
fix(e-invoicing): cannot cancel invoice if IRN cancelled on portal ( #26879 )
2021-08-10 17:16:15 +05:30
Frappe PR Bot
18bd182f61
patch: delete all orphaned tables docs ( #26863 )
2021-08-09 18:34:51 +05:30
Frappe PR Bot
1b9a5c851d
fix: incorrect amount in work order required items table. ( #26585 ) ( #26623 )
...
* fix: amount in work order not equal to rate * qty
* fix: patch for amount in work order required items
(cherry picked from commit cd12d95a24ankush@iwebnotes.com >
2021-08-03 20:06:36 +05:30
Ankush
e43bdf76a5
chore: warning for shopify integration deprecation ( #26701 )
...
* chore: warning for shopify integration deprecation
* fix: warn deprecation during patch for sysadmins
2021-08-02 18:57:48 +05:30
Anupam Kumar
89f2138fbc
Merge branch 'version-13-hotfix' into email-digest
2021-07-28 18:24:29 +05:30
Deepesh Garg
9350249941
fix: Chnage fieldtype from data to check
2021-07-28 12:57:59 +05:30
Deepesh Garg
328444b530
fix(India): Default value for export type
2021-07-23 20:28:02 +05:30
Rucha Mahabal
57514f7b1d
feat(Non Profit): API Endpoint to update halted Razorpay subscriptions ( #26427 ) ( #26564 )
...
* feat: Update Subscription Activated field to Subscription Status to accomodate Halted status
* feat: API Endpoint to halt Razorpay subscription
* fix: sider
* fix: validation message
* test: halted razorpay subscription
2021-07-21 00:46:34 +05:30
Rohit Waghchaure
13e9aa5956
fix: added patch to fix missing FG item
2021-07-16 14:34:24 +05:30
Rohit Waghchaure
61690775a8
feat: provision to make subcontracted purchase order from the production plan
2021-06-29 19:59:20 +05:30
Rohit Waghchaure
c878389050
fix: or condition filter in the get_all
2021-06-24 18:14:18 +05:30
Afshan
7fd44907ba
feat: fetching of qty as per received qty from PR to PI ( #26184 )
2021-06-24 14:26:36 +05:30
Gavin D'souza
3dfbfe87e9
chore: Drop < v10 patches from list
...
v7 backup was restored and upgraded to latest v10.x.x branch. The patches run uptil the upgrade are removed in this change. This means only existing v10 sites are allowed direct upgrade to v13 and newer
There are older version patches still left since they're being used in later ERPNext versions too.
2021-06-10 15:07:56 +05:30
Deepesh Garg
0ea6725baa
fix: Rename Loan Management workspace to Loans ( #25856 )
2021-05-31 19:48:31 +05:30
Anuja P
5e4128e70c
fix: patch for existing issues
2021-05-26 20:03:14 +05:30
Anurag Mishra
5670cf4386
feat: enhancements in Training Event ( #25782 )
...
* feat: Some Minor fixes
* fix: patch file
* fix: patch
Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com >
2021-05-24 20:24:20 +05:30
Anupam
aeb88385bb
patch: timesheet changes
2021-05-20 14:11:36 +05:30
Anupam
35137ba9e0
removing currency filter and added rate conversion while fetching timesheets in SI
2021-05-16 14:17:56 +05:30
Anupam
fd4743cc31
refactor: timesheet
2021-05-15 20:01:17 +05:30
Deepesh Garg
55fe85d850
feat(India): Multiple GST enhancement and fixes ( #25249 )
...
* fix: RCM tax calculation
* feat(India): ITC Reversal via Journal Entry
* fix: Reverse Charge booking logic and validation
* fix: Addd patch for availed ITC fields
* fix: Hooks method to update availed ITC field
* fix: Cleanup and fixes in GSTR3B report
* fix: Update params in GSTR-1 report
* fix: Debit note using Sales Invoice
* fix: Setup and patch
* fix: GSTR 3B report cleanup and updates
* fix: Add method to get invoices liable to reverse charge
* fix: Add taxable value in Purchase Invoice Item
* fix: Inward supplies liable to reverse charge
* fix: Linting issues
* fix: GSTR3B report test
2021-05-14 12:17:41 +05:30
Saqib
900a8fb21a
feat(pos): ability to retry on pos closing failure ( #25595 )
...
* feat(pos): ability to retry on pos closing failure
* fix: sider issues
* fix: sider issues
* fix: mark all queued closing entry as failed
* feat: add headline message
2021-05-06 17:02:47 +05:30
Saqib
d502f76319
feat(e-invoicing): e-way bill validity field ( #25555 )
2021-05-06 16:10:55 +05:30
Raffael Meyer
b2be91e731
Merge branch 'develop' into datev_fixes
2021-04-27 12:21:14 +02:00
Ankush Menat
9178d95cca
fix: can not create item variants ( #25433 )
...
* fix: item_code assigned to function returning None
* fix: ignore has_variants and attributes in variant
* fix: patch to remove has_variants and attributes
* chore: fix whitespace in translation
2021-04-26 15:37:17 +05:30
Ankush Menat
e972ceb798
fix: patch for updating shipment status
2021-04-18 13:22:19 +05:30
Ankush Menat
d6be154ac2
fix: implicit string concatenation ( #25371 )
...
* fix: implicit string concatenations
* chore: rerun healthcare patch for company fields
2021-04-16 22:08:44 +05:30
Raffael Meyer
6daae681bd
Merge branch 'develop' into datev_fixes
2021-04-16 12:37:14 +02:00
Nabin Hait
2535fe9b1e
fix: Resolved merge conflict
2021-04-14 13:09:50 +05:30
Rohit Waghchaure
a8f78fabfd
fix: patch failing while migrating from v7 to v13
2021-04-13 18:51:21 +05:30
Rohit Waghchaure
610ccd4c03
fix: modified permission
2021-04-13 18:51:21 +05:30
Rohit Waghchaure
03635fb0c4
feat: ESS User
2021-04-13 18:51:21 +05:30
Saqib
dbb76a7d00
fix(e-invoicing): validations & tax calculation fixes ( #25314 )
...
* fix: GST on freight charge in e-invoicing
* feat(india): bulk e-invoice generation (#24969 )
* fix: cannot fetch e invoice settings
* fix: patch condition (#25301 )
* fix: patch condition
* fix: except einvoice loading error seperately
* fix: json.loads error
Co-authored-by: Deepesh Garg <42651287+deepeshgarg007@users.noreply.github.com >
2021-04-13 18:49:03 +05:30
Nabin Hait
10c61376e3
fix: Backport missing commits to develop branch ( #25305 )
2021-04-13 15:46:01 +05:30
Deepesh Garg
bb92929048
Merge pull request #25256 from nextchamp-saqib/italy-e-invoicing
...
feat(italy): add document type field for e-invoicing
2021-04-13 13:48:21 +05:30
Saqib
9320316462
feat(india): bulk e-invoice generation ( #24969 )
2021-04-12 17:55:46 +05:30
Deepesh Garg
c36e48a869
fix: GST on freight charge in e-invoicing ( #25000 )
...
* fix: GST on freight charge in e-invocing
* fix: Add patch for taxable value field
* fix: Handle discounts on net total
* fix: Handle all types of discounts for e-invoicing
* fix: Absolute taxable values
* fix: Use correct tax amount
2021-04-12 10:55:43 +05:30
Deepesh Garg
81ecd0b8b6
Merge branch 'develop' of https://github.com/frappe/erpnext into delivery_note_gst_category
2021-04-10 20:54:38 +05:30
Saqib Ansari
032246dc2b
feat(italy): add document type field for e-invoicing
2021-04-09 12:08:24 +05:30
barredterra
c6e13ac218
fix: patch to fill Debtor/Creditor Number
2021-04-08 16:57:55 +02:00
barredterra
03425071e7
fix: patch to add custom fields
2021-04-08 16:31:00 +02:00
