Ankush Menat
73b3a2f685
chore: whitespace
2021-09-03 21:57:38 +05:30
Deepesh Garg
41392acd18
Merge branch 'develop' of https://github.com/frappe/erpnext into tds_validity
2021-09-03 19:19:35 +05:30
Deepesh Garg
8f5a77446e
Merge pull request #27279 from deepeshgarg007/gstr_1_cdnr_unregistered_json_develop
...
feat: CDNR Unreg json generation
2021-09-03 13:55:00 +05:30
Deepesh Garg
a06a70d1a4
fix: Patch error and tests
2021-09-03 13:13:37 +05:30
Deepesh Garg
79d250845e
fix: Patch
2021-09-03 13:13:37 +05:30
Deepesh Garg
2b34028acd
fix: Patch and linting errors
2021-09-03 13:13:37 +05:30
Ankush Menat
d1fe060e4a
fix: south africa vat patch failure ( #27323 )
...
reload doc is necessary on new doctypes
2021-09-03 12:02:32 +05:30
ChillarAnand
66e92d423e
chore: Added healthcare deprecation warning patch
2021-09-02 20:02:11 +05:30
Deepesh Garg
e1fffdb262
fix: Linting issues
2021-09-02 19:10:49 +05:30
Deepesh Garg
c85242e03d
Merge branch 'develop' of https://github.com/frappe/erpnext into gstr_1_cdnr_unregistered_json_develop
2021-09-02 18:59:59 +05:30
ChillarAnand
5d4133ecac
chore: Removed healthcare demo, patch files
2021-09-02 18:25:36 +05:30
Ankush Menat
60185c8c71
chore: linting
...
[skip ci]
2021-09-02 17:36:05 +05:30
Chillar Anand
915b34391c
chore: Clean up imports ( #27302 )
...
* chore: Added isort to pre-commit config
* chore: Sort imports with isort
* chore: Clean up imports with pycln
* chore: Sort imports with isort
* chore: Fix import issues
* chore: Clean up sider issues
* chore: Remove import errors from flake8 ignore list
* chore: Clean up lint issues
2021-09-02 16:44:59 +05:30
Ankush Menat
b25d28e023
fix(patch): delete stale shopify doctypes ( #27313 )
2021-09-02 14:53:06 +05:30
Ankush Menat
b147b85e6a
chore: whitespace / eof fixes
2021-09-01 16:57:21 +05:30
Ankush Menat
694ae81618
fix: remove bare excepts
2021-09-01 15:02:28 +05:30
Deepesh Garg
8b644d8889
fix: Report and JSON generation for Advances received
2021-09-01 10:28:15 +05:30
Deepesh Garg
b6d0b17ed6
fix: Linting and patch fixes
2021-09-01 10:11:18 +05:30
Subin Tom
7004944cc0
feat: Taxjar Integration update ( #27143 )
...
* feat: Taxjar Integration update
* added taxable_amount,taxable_amount fields in setup.py
* Update taxjar_integration.py
Sider issues fix
* Sider issues fix
* Sider issues fix
* sider issue fix: unused import
* sider issue fix
* Update erpnext/erpnext_integrations/taxjar_integration.py
Co-authored-by: Deepesh Garg <42651287+deepeshgarg007@users.noreply.github.com>
* Removed permission for 'All'
Co-authored-by: Deepesh Garg <42651287+deepeshgarg007@users.noreply.github.com>
2021-08-31 18:33:16 +05:30
Deepesh Garg
5e10e10329
feat: Validity dates in Tax Withholding Rates
2021-08-31 18:23:28 +05:30
Shadrak Gurupnor
7433757489
fix: patches were breaking during migration ( #27200 )
...
* fix: patches were breaking during migrating
* fix: patches were breaking during migration
2021-08-27 18:00:16 +05:30
Shadrak Gurupnor
17e0fa7a8b
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>
2021-08-27 16:42:25 +05:30
rohitwaghchaure
e6799d78ef
fix: operation time auto set to zero ( #27188 )
2021-08-27 10:46:45 +05:30
Rohan
16eed07a0f
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>
2021-08-26 21:47:00 +05:30
Ganga Manoj
842ceb1301
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>
2021-08-25 20:32:26 +05:30
Frappe PR Bot
255b99ebdc
feat: Employee reminders ( #25735 ) ( #27115 )
...
* 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>
(cherry picked from commit 24b2a315818d08ad4cb03347ccf5297df916a5ac)
Co-authored-by: Mohammad Hussain Nagaria <34810212+NagariaHussain@users.noreply.github.com>
Co-authored-by: Jannat Patel <31363128+pateljannat@users.noreply.github.com>
2021-08-24 20:19:22 +05:30
Saqib
c335962827
refactor!: drop e-invoicing integration from erpnext ( #26940 )
2021-08-20 11:10:46 +05:30
Ankush Menat
4551d7d602
chore: mass trailing whitespace and EOF fixes
2021-08-19 13:43:28 +05:30
Marica
112fc888f1
fix: Return Qty in PR/DN for legacy data ( #27001 )
2021-08-18 15:29:48 +05:30
Ankush Menat
8bbec42fa0
fix: undo changes to patch ( #26983 )
...
* fix: undo changes to patch
* ci: ignore empty body / head
2021-08-17 15:14:13 +05:30
Rohit Waghchaure
eb1e3181a4
fix: conflicts while merging brnach version-13 to develop
2021-08-17 10:53:19 +05:30
Deepesh Garg
4b9c127494
Merge branch 'version-13-pre-release' of https://github.com/frappe/erpnext into export_type_mandatory_v13_pre
2021-08-16 14:38:54 +05:30
Deepesh Garg
b58b1127f3
fix: Add mandatory depends on condition for export type field
2021-08-16 14:36:50 +05:30
Deepesh Garg
3f07bb7021
fix: Add mandatory depends on condition for export type field
2021-08-16 13:18:39 +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
Saqib
84c4161c00
fix(e-invoicing): cannot cancel invoice if IRN cancelled on portal ( #26638 )
2021-08-10 16:46:44 +05:30
Frappe PR Bot
18bd182f61
patch: delete all orphaned tables docs ( #26863 )
2021-08-09 18:34:51 +05:30
Anuja Pawar
08ae49cd11
fix(regional): add permissions for VAT Audit report ( #26851 )
...
fix(regional): add permissions for VAT Audit report
2021-08-09 17:58:52 +05:30
Ganga Manoj
458f7f1194
patch: delete all orphaned tables docs ( #26743 )
2021-08-09 17:16:48 +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 cd12d95a24
)
Co-authored-by: Ankush <ankush@iwebnotes.com>
2021-08-03 20:06:36 +05:30
Deepesh Garg
346bde875c
Merge branch 'develop' of https://github.com/frappe/erpnext into sa-vat-report
2021-08-03 14:44:20 +05:30
Frappe PR Bot
5a442f1bce
fix: change format string to percent string interpolation ( #26774 ) ( #26778 )
...
(cherry picked from commit 7fe588e236
)
Co-authored-by: Alan <2.alan.tom@gmail.com>
2021-08-03 13:29:10 +05:30
Anuja
f2ee1155c0
fix: sider fixes
2021-08-02 23:13:21 +05:30
Ankush
efb037b566
refactor!: drop shopify integration from ERPNext ( #26700 )
...
BREAKING CHANGE: remove Shopify integration.
The integration is moved to a separate app with additional enhancements.
The app is still FOSS and licensed under the same license as ERPNext. Any
data migration required is taken care of after installing the app and
enabling it.
New app: https://github.com/frappe/ecommerce_integrations
2021-08-02 21:57:52 +05:30
Alan
7fe588e236
fix: change format string to percent string interpolation ( #26774 )
2021-08-02 20:07:55 +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
Anuja
3bcbc86291
fix: resolved conflicts in patches.txt
2021-08-02 12:58:46 +05:30
Anuja
f9fc3bbfa8
fix: added patch for custom field and minor fixes
2021-08-02 12:54:30 +05:30
Rohit Waghchaure
343143037c
fix: conflicts
2021-08-01 14:45:24 +05:30
Anupam Kumar
89f2138fbc
Merge branch 'version-13-hotfix' into email-digest
2021-07-28 18:24:29 +05:30
Deepesh Garg
6ac68f3bc7
fix: Patch
2021-07-28 17:19:00 +05:30
Deepesh Garg
8c7d9efa9d
fix: Chnage fieldtype from data to check
2021-07-28 17:18:50 +05:30
Deepesh Garg
fa8e6ac7cd
fix: Patch
2021-07-28 15:30:05 +05:30
Deepesh Garg
9350249941
fix: Chnage fieldtype from data to check
2021-07-28 12:57:59 +05:30
Frappe PR Bot
3a39c0f19a
fix: force reload of Opportunity in patch ( #26668 ) ( #26681 )
...
(cherry picked from commit ac2e139d5b
)
Co-authored-by: Raffael Meyer <14891507+barredterra@users.noreply.github.com>
2021-07-28 00:19:32 +05:30
Raffael Meyer
ac2e139d5b
fix: force reload of Opportunity in patch ( #26668 )
2021-07-28 00:14:59 +05:30
Frappe PR Bot
b122a1eaa0
fix: reload manufacturing setting before patch ( #26641 ) ( #26670 )
...
(cherry picked from commit c8d7a8c781
)
Co-authored-by: Ankush <ankush@iwebnotes.com>
2021-07-27 16:59:06 +05:30
Ankush
7a97b6d6a8
fix: reload manufacturing setting before patch ( #26641 )
...
(cherry picked from commit c8d7a8c781
)
2021-07-27 11:19:33 +00:00
Ankush
c8d7a8c781
fix: reload manufacturing setting before patch ( #26641 )
2021-07-27 16:39:38 +05:30
Deepesh Garg
a661667e2a
fix(India): Default value for export type
2021-07-26 18:46:14 +05:30
Ankush
cd12d95a24
fix: incorrect amount in work order required items table. ( #26585 )
...
* fix: amount in work order not equal to rate * qty
* fix: patch for amount in work order required items
2021-07-25 13:10:50 +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
Rucha Mahabal
a758071532
feat(Non Profit): API Endpoint to update halted Razorpay subscriptions ( #26427 )
...
* 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:24:09 +05:30
Rohit Waghchaure
56e4a88956
fix: added patch to fix missing FG item
2021-07-16 15:06:57 +05:30
Rohit Waghchaure
13e9aa5956
fix: added patch to fix missing FG item
2021-07-16 14:34:24 +05:30
Rohit Waghchaure
a748dd9261
feat: provision to make subcontracted purchase order from the production plan
2021-07-15 19:01:36 +05:30
Saqib
0683337f14
fix: incorrect response by variance & resolution by variance ( #26173 )
2021-07-12 20:21:07 +05:30
Nabin Hait
fa006402b8
fix: merge conflict
2021-07-01 12:47:28 +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
Afshan
53fefd7513
feat: fetching of qty as per received qty from PR to PI ( #25837 )
2021-06-24 10:09:02 +05:30
Nabin Hait
0950481253
fix: merge conflict
2021-06-15 20:18:06 +05:30
Saqib
80077d215f
fix: patch for adding doctype to sla ( #26053 )
2021-06-14 19:34:25 +05:30
Himanshu
ec25d5938b
feat(SLA): Apply SLA to any document ( #22449 )
2021-06-14 19:05:52 +05:30
Gavin D'souza
137d08a9d7
fix: Manually link_fields from flags before rename_doc
2021-06-10 15:09:17 +05:30
Gavin D'souza
96f8ebc308
fix(patch): Handle NULL values from fieldtype change
2021-06-10 15:08:55 +05:30
Gavin D'souza
aedf25ba46
chore: Drop old patches
...
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
2021-06-10 15:07:39 +05:30
Gavin D'souza
102afe7de1
fix: Manually link_fields from flags before rename_doc
2021-06-04 20:11:34 +05:30
Gavin D'souza
ac99c719bc
Revert "fix(patch): Reload linked doctypes before renaming dt"
...
This reverts commit 4e2e8daca9
because although it fixed it locally, didn't seem to do anything for erpnext CI
2021-06-04 20:10:26 +05:30
Gavin D'souza
4e2e8daca9
fix(patch): Reload linked doctypes before renaming dt
2021-06-04 17:56:28 +05:30
Gavin D'souza
0b7da52ef1
fix(patch): Handle NULL values from fieldtype change
2021-06-04 17:07:45 +05:30
Gavin D'souza
5bf5775b43
chore: Drop old patches
...
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
2021-06-04 11:49:56 +05:30
Ankush Menat
2c7fac0e76
fix: reload doc for possible future schema changes ( #25904 )
2021-06-01 11:56:00 +05:30
Anuja P
e2059fb9f6
fix: spaces to tabs
2021-05-26 20:07:53 +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
Rucha Mahabal
0d8b9a9d0a
fix(patch): billable field not renamed
2021-05-20 19:53:30 +05:30
Anupam
1270febfff
fix: sider issues
2021-05-20 14:15:58 +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
cab998c293
adding patch
2021-05-15 20:40:20 +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
Shadrak Gurupnor
f648d2d7c4
fix: added tax_types list ( #25587 )
2021-05-07 12:15:19 +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
barredterra
24e2cc9107
Merge branch 'develop' into datev_fixes
2021-05-03 18:19:28 +02:00
Rohit Waghchaure
2fb573781d
fix: rename field has not updated value of deposit and withdrawal fields
2021-05-01 17:56:40 +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
Anoop
c21ce42559
fix(patch): lab module patch fix ( #25447 )
...
* fix(patch): lab module patch fix
* fix: param
Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
2021-04-22 22:44:44 +05:30
Rucha Mahabal
e3b8057eb4
fix: Laboratory Module patch ( #25431 )
2021-04-22 16:11: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
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
a19c98255f
fix: patch condition ( #25301 )
2021-04-12 19:02:28 +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
Anoop
207166fe8b
fix(patch): copy Lab Test / Template renamed field values ( #25276 )
...
reload_doc doctypes introduced since v11
2021-04-12 10:25:34 +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
Rohit Waghchaure
1db8c51749
fix: changed logic
2021-04-10 10:45:29 +05:30
Rohit Waghchaure
1358443cdb
fix: patch
2021-04-10 10:42:08 +05:30
Anupam Kumar
986452107b
fix: Lead Source's module ( #24583 )
...
* fix: Lead Source's module
* fix: patch fix
2021-04-09 18:15:51 +05:30
Saqib Ansari
032246dc2b
feat(italy): add document type field for e-invoicing
2021-04-09 12:08:24 +05:30
barredterra
0a45fc8c58
fix: remove unused import
2021-04-08 18:25:17 +02:00
barredterra
c6e13ac218
fix: patch to fill Debtor/Creditor Number
2021-04-08 16:57:55 +02:00
barredterra
ed36fb2073
docs: doctring for patch
2021-04-08 16:57:20 +02:00
barredterra
03425071e7
fix: patch to add custom fields
2021-04-08 16:31:00 +02:00
Nabin Hait
aa809ceffe
fix: Patch fixes for v13 upgrade ( #25220 )
2021-04-07 10:57:46 +05:30
Anupam
e711b30f66
fix: resolved conflicts
2021-04-05 17:06:59 +05:30
Anoop
b27441b40c
fix: failing patch - reload_doc new doctypes added in v13 ( #25194 )
2021-04-05 10:41:28 +05:30
Saurabh
f9b9298a6d
fix: reload doc in patch ( #25144 )
2021-04-01 21:59:35 +05:30
Nabin Hait
11eb30d082
fix: merge conflict
2021-04-01 15:03:11 +05:30
Ankush Menat
1bdf9c4161
fix: patch for purchase receipt status
2021-04-01 11:58:34 +05:30
Saqib
fb4051bddd
feat: discount configuration on early payments ( #25089 )
...
* feat: discount configuration on early payments
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
* fix: remove duplicate patch call
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2021-03-31 15:52:51 +05:30
Saqib
0586b7db79
feat: discount configuration on early payments ( #24586 )
...
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2021-03-31 15:03:53 +05:30
Deepesh Garg
f954ec7c78
fix: Add patch for GST category field in Delivery Note
2021-03-29 20:31:11 +05:30
rohitwaghchaure
b38ea0cc8b
fix: patch ( #25014 )
...
* fix: patch
* fix: pricing_rule test cases
2021-03-28 15:51:32 +05:30
Mohammad Hasnain Mohsin Rajan
52701dcbbc
fix: patch regional fields for old companies ( #24988 )
2021-03-25 12:56:33 +05:30
Mohammad Hasnain Mohsin Rajan
f29c075bc3
fix: patch regional fields for old companies ( #24999 )
...
* fix: patch regional fields for old companies
* chore: fix sider
2021-03-25 12:56:13 +05:30
Syed Mujeer Hashmi
f114da2f67
refactor: Make Discharge Schedule Date as Datetime ( #24940 )
...
* refactor: Make Discharge Schedule Date as Datetime
Like Admitted Datetime make discharge date as discharge datetime.
Signed-off-by: Syed Mujeer Hashmi <mujeerhashmi@4csolutions.in>
* fix: Add patch for renaming discharge_date to discharge_datetime
Signed-off-by: Syed Mujeer Hashmi <mujeerhashmi@4csolutions.in>
* fix: quote style
Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
2021-03-23 17:48:25 +05:30
Rushabh Mehta
6ef213e5c6
fix(minor): patch add_state_code_for_ladakh
2021-03-16 11:59:54 +05:30
Nabin Hait
6e3668dc30
fix: merge conflict
2021-03-11 16:14:27 +05:30
Rucha Mahabal
0b29f87fa2
feat(Non Profit): 80G Certificates and Donations ( #24848 )
...
* feat(Non Profit): 80G Certificates and Donations
* fix(Membership): Generate Invoice for membership webhook only if automation is enabled (#24849 )
2021-03-11 16:02:23 +05:30
Rucha Mahabal
be2c1fca7b
feat(Non Profit): 80G Certificates and Donations ( #24657 )
...
* feat: 80G Certificates
* feat: add non-profit custom fields for India
* feat: 80G Certificate print format for memberships
* feat: Donation doctype and API endpoint to capture donations via razorpay
* chore: Rename Membership Settings to Non Profit Settings
* chore: clean up Non Profit Settings
- Rename fields, better labels
- patch for renaming
* feat: Webhook secret generation for Razorpay donations in Non-Profit Settings
* feat: Payment Entry for donations
- added Donor as Party Type
- setting for automating payment entries for donations created via web form
* fix: linter and sider issues
* fix: translation syntax
* feat: PAN Details custom field for Indian donors
* feat: 80G certificates for Donations with Print Format
* fix: sider
* feat: validations for donor and donation
- create donor for website user from donations
- validate donor email
* feat: extract member name from subscription notes
* test: Donation
* test: Tax Exemption 80G Certificate
* chore: styling fixes
* fix: tests
* fix: sider
* feat: extract PAN number from additional subscription notes
* feat: Add creation user field in Non Profit Settings
fix: Payment Entry not generating for memberships and donations
* feat: update desk page
* fix: tests
2021-03-11 13:19:44 +05:30
Saurabh
202ef92fa1
Merge branch 'version-13-beta-pre-release' into version-13-beta
2021-03-05 09:34:01 +05:30
Saqib Ansari
49e4693abf
fix(patch): updating pos closing reference in merge log
2021-03-04 11:58:45 +05:30
Nabin Hait
d96be3f9f1
Reposting patch and earned leave rounding ( #24783 )
...
* fix: rounding of earned leave is optional (#24782 )
* fix: reposting patch fixes (#24775 )
2021-03-02 17:02:47 +05:30
Nabin Hait
bd10d7c028
fix: reposting patch fixes ( #24775 )
2021-03-02 13:37:45 +05:30
Rohit Waghchaure
9f13a060f0
fix: reposting patch
2021-02-26 17:44:54 +05:30
Rohit Waghchaure
c603fd638b
fix: reposting patch
2021-02-26 17:42:52 +05:30
Rohit Waghchaure
39b5ad8e69
fix: patch failing because of incorrect gl entries
2021-02-23 18:35:36 +05:30
Rohit Waghchaure
bc8c9de26d
fix: patch failing because of incorrect gl entries
2021-02-23 18:26:48 +05:30
Nabin Hait
d46b23699c
fix: optimize reposting of gle and sle ( #24702 )
...
* fix(india): escape for special characters in JSON (#24695 )
JSON does not accept special whitespace characters like tab, carriage
return, line feed
Ref: https://www.ecma-international.org/wp-content/uploads/ECMA-404_2nd_edition_december_2017.pdf
Related issue: ISS-20-21-09811
* fix: Accounting Dimension creation background job timeout
* fix(regional): vehicle no is mandatory for ewaybill generation (#24679 )
* fix: vehicle no required for e-invoice
* fix: ewaybill generation dialog condition
* fix: excluding unidentified accounts from gstr-1
* fix: optimize reposting of sle and gle (#24694 )
* fix: optimize update_gl_entries_after method
* fix: Optimized reposting patch
* fix: accounting dimensions
* added reload_doc in patch
* Update item_reposting_for_incorrect_sl_and_gl.py
Co-authored-by: Rohit Waghchaure <rohitw1991@gmail.com>
* fix: Replaced spaces with tabs
* fix: merge conflict
* fix: test cases
Co-authored-by: Ankush Menat <ankush@iwebnotes.com>
Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
Co-authored-by: Saqib <nextchamp.saqib@gmail.com>
Co-authored-by: pateljannat <pateljannat2308@gmail.com>
Co-authored-by: Rohit Waghchaure <rohitw1991@gmail.com>
2021-02-23 16:38:52 +05:30
Nabin Hait
19f8fa59d3
fix: optimize reposting of sle and gle ( #24694 )
...
* fix: optimize update_gl_entries_after method
* fix: Optimized reposting patch
* fix: accounting dimensions
* added reload_doc in patch
* Update item_reposting_for_incorrect_sl_and_gl.py
Co-authored-by: Rohit Waghchaure <rohitw1991@gmail.com>
2021-02-22 22:27:22 +05:30
Mohammad Hasnain Mohsin Rajan
07f40596bc
feat(Bank Reconciliation): Redesign ( #24273 )
...
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2021-02-22 22:19:47 +05:30
Nabin Hait
69a6bed106
fix: Replaced spaces with tabs
2021-02-22 20:03:23 +05:30
Nabin Hait
0ca74ce04b
fix: Fixes related to client script renaming ( #24698 )
2021-02-22 19:32:51 +05:30
Saqib
14472f6bab
fix(regional): vehicle no is mandatory for ewaybill generation ( #24679 )
...
* fix: vehicle no required for e-invoice
* fix: ewaybill generation dialog condition
2021-02-22 19:27:23 +05:30
Ankush Menat
3248da9089
fix(India): Add GST state code for Ladakh
2021-02-18 21:32:48 +05:30
Nabin Hait
deddcc513d
fix: stock and account balance syncing ( #24644 )
...
* fix: stock and account balance syncing
* fix: stock and account balance syncing
* fix: stock and account balance syncing
* fix: minor fix
2021-02-18 21:28:16 +05:30
Rohit Waghchaure
83f5468ca1
fix: patch
2021-02-18 21:28:03 +05:30
rohitwaghchaure
7797e9d3ac
fix: added patch to fix incorrect stock qty and account value ( #24628 )
2021-02-18 21:27:01 +05:30
Saqib
90ff48baa3
refactor: POS Invoice merging and cancellation ( #24351 )
...
* feat: pos invoice merging with background jobs
* fix: invoice threshold for queueing job
* refactor: cancellation flow of point of sale
* feat: tests for cancellation of pos closing
Co-authored-by: Marica <maricadsouza221197@gmail.com>
2021-02-18 21:00:34 +05:30
Marica
052a2767f0
Merge branch 'develop' into email-digest
2021-02-17 11:21:14 +05:30
Nabin Hait
9b178bcd10
fix: stock and account balance syncing ( #24644 )
...
* fix: stock and account balance syncing
* fix: stock and account balance syncing
* fix: stock and account balance syncing
* fix: minor fix
2021-02-16 14:57:00 +05:30
Rohit Waghchaure
9a40c1b2e1
fix: patch
2021-02-16 10:35:10 +05:30
rohitwaghchaure
d60ff83b6f
fix: added patch to fix incorrect stock qty and account value ( #24628 )
2021-02-16 09:12:27 +05:30
Ankush Menat
57c3d373a7
fix(India): Add GST state code for Ladakh
2021-02-15 15:03:50 +05:30
Saurabh
df589594cd
Merge branch 'version-13-beta-pre-release' into version-13-beta
2021-02-02 20:58:26 +05:30
Suraj Shetty
54a253616a
Merge pull request #24508 from frappe/rebrand-ui
2021-02-02 09:07:35 +05:30
Suraj Shetty
852e67c5ee
fix(patch): Use db_set to ignore validation
2021-02-01 22:40:40 +05:30
Marica
2fa840e5d4
chore: Use sql to set naming series in older projects ( #24513 )
...
* chore: Use sql to set naming series in older projects
* fix: Remove unncessary db.commit()
2021-02-01 20:07:00 +05:30
Marica
fb016edb7a
chore: Use sql to set naming series in older projects ( #24512 )
...
* chore: Use sql to set naming series in older projects
* fix: Remove unncessary db.commit()
2021-02-01 20:05:29 +05:30
Saqib Ansari
cee3670167
chore: clean up sales invoice form
2021-02-01 15:45:26 +05:30
Suraj Shetty
0a8939e1c1
Merge branch 'develop' of https://github.com/frappe/erpnext into rebrand-ui
2021-01-29 08:56:22 +05:30
Saqib
675a8330a4
refactor: POS Invoice merging and cancellation ( #24351 )
...
* feat: pos invoice merging with background jobs
* fix: invoice threshold for queueing job
* refactor: cancellation flow of point of sale
* feat: tests for cancellation of pos closing
Co-authored-by: Marica <maricadsouza221197@gmail.com>
2021-01-28 18:42:43 +05:30
Saqib
ac9e6ff704
fix(pos): multiple pos fixes and additions ( #24227 )
...
* fix: make custom fields in pos invoice similar to sales invoice
* feat: allow/disallow rate & discount change
* fix: any pos profile can be selected while creating pos opening
* fix: cannot add item to cart
* fix: validate phone payment only if payment request exists
* fix: replace pos payment method patch
* chore: rearrange item & customer group filter
* fix: allow/disallow invoice level discount
* fix: updating qty of item with uom having space char
* fix: move configuration checbox to config section
* fix: invalid item rate trigger
* fix: cannot remove item from draft invoices
* fix: customer currency not set in pos invoice
* fix: duplicate item error message
* fix: sales uom not fetched in pos invoice
* fix: cannot add taxes to pos invoice for uae region
* fix: cannot merge pos invoice into credit note
* fix: tax calculation while merging pos invoices
* feat: delete draft orders from order list
* fix: merging of pos invoice with pricing rules
2021-01-28 17:58:55 +05:30
Marica
ec4f42d4a9
Merge branch 'develop' into project-naming-series-patch
2021-01-25 11:29:23 +05:30
Deepesh Garg
164079127f
Merge pull request #24446 from deepeshgarg007/patch-fix-1-new
...
fix: Project Template patch
2021-01-25 10:37:43 +05:30
Deepesh Garg
5b4ece5054
fix: Update patch
2021-01-22 17:12:35 +05:30
marination
7ba60570e7
fix: Spaces to Tabs
2021-01-22 16:55:06 +05:30
marination
c908deea61
fix: Patch to Add Naming Series to old projects
2021-01-22 16:10:01 +05:30
Deepesh Garg
cf7209f3d4
fix: Project Template patch
2021-01-22 11:47:13 +05:30
Rucha Mahabal
7201498801
Merge branch 'develop' into patient-history-enhancements
2021-01-22 09:04:37 +05:30
Rucha Mahabal
d98b506478
fix: patch
2021-01-21 13:23:59 +05:30
Rucha Mahabal
53d0eebbe8
fix: patch for renaming field in Membership Settings
2021-01-20 23:22:08 +05:30
Rucha Mahabal
bd02a42904
Merge branch 'develop' into membership-enhancements-2
2021-01-20 12:49:37 +05:30
Suraj Shetty
bbc6bfd3c3
Merge branch 'develop' of https://github.com/frappe/erpnext into rebrand-ui
2021-01-19 09:34:06 +05:30
Rucha Mahabal
751719ea0d
Merge branch 'develop' into patient-history-enhancements
2021-01-14 14:08:50 +05:30
Anupam
5abb997a27
fix: resolved conflicts
2021-01-13 11:11:22 +05:30
Saqib
d43bb4db41
fix(pos): error while merging pos invoices into sales invoice ( #24337 )
2021-01-11 12:59:35 +05:30
Jannat Patel
8a07de9ee0
Merge branch 'develop' into project-template-and-tasks
2021-01-11 10:57:09 +05:30
pateljannat
2460e101a7
fix: indicator ofor template task
2021-01-11 10:05:54 +05:30
Marica
5cfdd0f503
Merge branch 'develop' into qi-ux
2021-01-07 15:47:55 +05:30
pateljannat
fd5ebe9d4a
fix: patch and columns
2021-01-07 15:16:15 +05:30
Jannat Patel
a586b0ba17
Merge branch 'develop' into project-template-and-tasks
2021-01-07 13:01:02 +05:30
Deepesh Garg
e72c51204b
Merge pull request #24189 from timgates42/bugfix_typo_update
...
docs: fix simple typo, udpate -> update
2021-01-06 09:34:11 +05:30
Marica
ba6e50b15e
Merge branch 'develop' into qi-ux
2021-01-05 15:15:10 +05:30
Anurag Mishra
b864b09d40
Merge branch 'develop' into gratuity
2021-01-05 14:47:38 +05:30
Marica
099162814c
Merge branch 'develop' into qi-ux
2021-01-05 09:27:40 +05:30
Afshan
0da201c6a5
fix: set company in leave allocation and leave ledger entry
2021-01-04 19:04:05 +05:30
Deepesh Garg
ffca52a348
Merge pull request #24254 from nextchamp-saqib/loan-patch-fix
...
fix: update old loan patch
2021-01-01 13:50:52 +05:30
Saqib Ansari
d5d571ab9d
fix: update old loan patch
2020-12-31 12:55:35 +05:30
Saqib
fc7a11e2aa
fix (e-invoicing): item & invoice value calculation ( #24253 )
2020-12-31 11:35:46 +05:30
Mohammad Hasnain Mohsin Rajan
11176852eb
Merge branch 'develop' into bugfix_typo_update
2020-12-30 20:59:38 +05:30
Saqib
f946bbd032
fix: minor e-invoicing issues ( #24239 )
...
* fix: invoice value set to zero if rounded total disabled
* fix: unit rate & gross amount calculation
* fix: e-invoice-setup patch
* chore: no need to re-run the patch
* fix: item value & invoice value calculations
2020-12-30 14:43:42 +05:30
Anurag Mishra
dfe8f7601b
Merge branch 'develop' into gratuity
2020-12-29 13:27:03 +05:30
marination
a69e81a151
chore: Made 'Parameter' a link field in QI and QI Template
...
- Added doctype Quality Inspection Parameter
- Made 'Parameter' a link field in QI and QI Template
- Added patch to create Quality Inspection Parameter records for every parameter in the system
2020-12-28 18:07:22 +05:30
pateljannat
71f203dbc5
fix: template task status, subject in project template task
2020-12-28 12:35:19 +05:30
Saqib
17e96901db
feat: GST E Invoicing ( #23455 )
...
* feat: init e-invoice settings
* feat: read public key file
* feat: rsa encryption with public key
* feat: save token and sek from auth request
* chore: handle error response
* feat: AES decryption of SEK with appkey
* feat: decrypt json data with SEK
* feat: make e invoice from erpnext sales invoice
* feat: generate IRN
* feat: decode signed json and QR code
* chore: validations
* feat: cancel IRN
* feat: complete e-invoice schema
* chore: move e-invoice settings to regional
* chore: split einvoice settings and operations
* chore: rename schema to template & js cleanup
* feat: make IRN field on regional setup
* feat: Generate & Cancel IRN from Sales Invoice
* chore: minor fixes
* fix: item discount
* chore: show irn cancelled check after cancellation
* fix: hide cancel irn dialog on error
* fix: public key is required on validate
* fix: cannot find attached key file
* fix: validation if e invoicing is disabled
* fix: do not show generate irn for invalid supply type
* fix: update irn_cancelled after cancelling irn
* chore: show irn field for proper gst_category
* feat: e-way bill details in e-invoice
* fix: save e-way bill no on irn generation
* chore: no copy on e invoice custom fields
* feat: cancel e-way bill before cancelling IRN
* feat: manual download / upload json
* chore: group e-invoicing actions
* fix: fn name
* chore: save signed invoice and qrcode after uplaoding irn
* fix: fetch token if not valid
* chore: move einvoicing stuff to seperate folder
* feat: QRCode Image and E-Invoice Print Format
* fix: bug
* fix: invalid syntax
* chore: code cleanup
* chore: clean up e invoice actions
* fix: download & upload e-invoice
* fix: print format
* fix: validations
* fix: add permissions on regional setup
* feat: add patch
* fix: validate document name
* fix: return date
* fix: credit note einvoice
* fix: validations
* fix: error logging
* fix: e_invoice module not found
* fix: add missing package
* fix: rename e_invoice_utils.py
* fix: einvoice field validation
* fix: patch
* fix: invoice totals calculation
* fix: other charges calculation
* chore: improve document name validation message
* fix: qr code image string
* feat: initialize GSP connector
* chore: remove unwanted fields
* fix: qr code generation
* feat: fetch and cache GSTIN details
* feat: generate & cancel IRN
* feat: cancel eway bill
* chore: remove unwanted fuctions
* chore: clean up einvoice actions
* fix: attach qrcode on irn generation
* fix: generate & cancel IRN
* fix: show/hide eway bill fields
* fix: valiations
* feat: generate eway bill from IRN
* chore: remove unwanted imports
* chore: error logging
* feat: header & footer in GST E Invoice
* chore: remove test pincode
* fix: invalid syntax
* feat: cess non advolem on einvoice item
* chore: remove fetch token from e invocie settings
* fix: imports
* fix: error handling
* feat: update timeline on einvoice actions
* fix: qrcode image size
* fix: exclude intra company transactions
* fix: eway bill test
* fix: ewaybill mandatory conditions
* chore: add tests
* fix: returning condition
* feat: log e-invocing requests
* chore: add ack date and ack no field for print formats
* fix: sider issues
* feat: show e-invoice preview before IRN generation
* fix: use as_list for error message
* fix: minor ux issues
* fix: dialog is undefined
* fix: error handling
* feat: add docs link to e invoice settings
* feat: multiple gstins for e invoicing
* fix: uncomment test condition
* fix: remove test pincode
* fix: cannot cancel irn without submitting sales invoice
* chore: code cleanup
* fix: sider issues
* fix: e invoice request log permissions
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2020-12-25 20:55:21 +05:30
Saqib
6d74f5b59b
feat: GST E Invoicing ( #23455 )
...
* feat: init e-invoice settings
* feat: read public key file
* feat: rsa encryption with public key
* feat: save token and sek from auth request
* chore: handle error response
* feat: AES decryption of SEK with appkey
* feat: decrypt json data with SEK
* feat: make e invoice from erpnext sales invoice
* feat: generate IRN
* feat: decode signed json and QR code
* chore: validations
* feat: cancel IRN
* feat: complete e-invoice schema
* chore: move e-invoice settings to regional
* chore: split einvoice settings and operations
* chore: rename schema to template & js cleanup
* feat: make IRN field on regional setup
* feat: Generate & Cancel IRN from Sales Invoice
* chore: minor fixes
* fix: item discount
* chore: show irn cancelled check after cancellation
* fix: hide cancel irn dialog on error
* fix: public key is required on validate
* fix: cannot find attached key file
* fix: validation if e invoicing is disabled
* fix: do not show generate irn for invalid supply type
* fix: update irn_cancelled after cancelling irn
* chore: show irn field for proper gst_category
* feat: e-way bill details in e-invoice
* fix: save e-way bill no on irn generation
* chore: no copy on e invoice custom fields
* feat: cancel e-way bill before cancelling IRN
* feat: manual download / upload json
* chore: group e-invoicing actions
* fix: fn name
* chore: save signed invoice and qrcode after uplaoding irn
* fix: fetch token if not valid
* chore: move einvoicing stuff to seperate folder
* feat: QRCode Image and E-Invoice Print Format
* fix: bug
* fix: invalid syntax
* chore: code cleanup
* chore: clean up e invoice actions
* fix: download & upload e-invoice
* fix: print format
* fix: validations
* fix: add permissions on regional setup
* feat: add patch
* fix: validate document name
* fix: return date
* fix: credit note einvoice
* fix: validations
* fix: error logging
* fix: e_invoice module not found
* fix: add missing package
* fix: rename e_invoice_utils.py
* fix: einvoice field validation
* fix: patch
* fix: invoice totals calculation
* fix: other charges calculation
* chore: improve document name validation message
* fix: qr code image string
* feat: initialize GSP connector
* chore: remove unwanted fields
* fix: qr code generation
* feat: fetch and cache GSTIN details
* feat: generate & cancel IRN
* feat: cancel eway bill
* chore: remove unwanted fuctions
* chore: clean up einvoice actions
* fix: attach qrcode on irn generation
* fix: generate & cancel IRN
* fix: show/hide eway bill fields
* fix: valiations
* feat: generate eway bill from IRN
* chore: remove unwanted imports
* chore: error logging
* feat: header & footer in GST E Invoice
* chore: remove test pincode
* fix: invalid syntax
* feat: cess non advolem on einvoice item
* chore: remove fetch token from e invocie settings
* fix: imports
* fix: error handling
* feat: update timeline on einvoice actions
* fix: qrcode image size
* fix: exclude intra company transactions
* fix: eway bill test
* fix: ewaybill mandatory conditions
* chore: add tests
* fix: returning condition
* feat: log e-invocing requests
* chore: add ack date and ack no field for print formats
* fix: sider issues
* feat: show e-invoice preview before IRN generation
* fix: use as_list for error message
* fix: minor ux issues
* fix: dialog is undefined
* fix: error handling
* feat: add docs link to e invoice settings
* feat: multiple gstins for e invoicing
* fix: uncomment test condition
* fix: remove test pincode
* fix: cannot cancel irn without submitting sales invoice
* chore: code cleanup
* fix: sider issues
* fix: e invoice request log permissions
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2020-12-25 10:26:43 +05:30
Nabin Hait
4da7a15ac0
fix: Fixed typo
2020-12-23 18:07:54 +05:30
Anurag Mishra
46e1c09b45
style: Broken into smaller function
2020-12-23 18:07:53 +05:30
Anurag Mishra
4d6c3c9449
Fix: Changes Requested, Sider, codacy, Transalation
2020-12-23 18:07:53 +05:30
Anurag Mishra
25c356894d
test: gratuity
2020-12-23 18:07:53 +05:30
Anurag Mishra
f63df91186
patch: to create standard Gratuity Rule for india and UAE
2020-12-23 18:07:53 +05:30
Tim Gates
1fb412e3f6
docs: fix simple typo, udpate -> update
...
There is a small typo in erpnext/patches/v4_0/map_charge_to_taxes_and_charges.py.
Should read `update` rather than `udpate`.
2020-12-23 11:39:37 +11:00
Rucha Mahabal
7574a14d57
fix: Remove patch for setting next date in Subscription ( #24158 )
2020-12-22 12:32:36 +05:30
pateljannat
9466e42e70
fix: change request modifications
2020-12-21 20:52:20 +05:30
pateljannat
79b71462cb
fix: patch
2020-12-17 18:21:34 +05:30
pateljannat
09f0e9111d
fix: patch
2020-12-17 17:20:21 +05:30
pateljannat
2dbb1d6bc7
fix: indentation
2020-12-17 15:49:52 +05:30
pateljannat
2f4c88b228
Merge branch 'project-template-and-tasks' of https://github.com/pateljannat/erpnext into project-template-and-tasks
2020-12-17 11:56:06 +05:30
pateljannat
f2bff8e220
fix: patch relaod doctype
2020-12-17 11:54:59 +05:30
Jannat Patel
28098d6f93
Merge branch 'develop' into project-template-and-tasks
2020-12-16 20:09:27 +05:30
Rucha Mahabal
21168eab7f
fix: Remove patch for setting next date in Subscription ( #24158 )
2020-12-16 19:39:34 +05:30
pateljannat
87b477a311
feat: patch for project template tasks
2020-12-16 13:37:21 +05:30
Rucha Mahabal
02ebc9a11e
Merge branch 'develop' into patient-history-enhancements
2020-12-16 12:51:45 +05:30
Suraj Shetty
f2511c84b5
Merge branch 'develop' of https://github.com/frappe/erpnext into rebrand-ui
2020-12-14 09:05:48 +05:30
Deepesh Garg
ced3b13492
fix: Check for paid field
2020-12-12 19:31:05 +05:30
Deepesh Garg
68fce6d029
Merge branch 'develop' of https://github.com/frappe/erpnext into loan_patch_fix
2020-12-12 19:28:50 +05:30
Rushabh Mehta
fec8dba16c
fix(merge): merge develop
2020-12-08 16:23:09 +05:30
Walstan Baptista
0baebbdafe
fix: added Purchase Order to Global Search ( #24055 )
2020-12-08 09:43:29 +05:30
Rucha Mahabal
063be69b58
fix(patch): set update_modified to False while setting issue/opportunity metrics ( #24073 )
2020-12-07 10:41:05 +05:30
rohitwaghchaure
0a672b69e6
Merge pull request #22859 from marination/pr-dn-return
...
feat: Return tracking in PR/DN
2020-12-06 22:43:34 +05:30
Deepesh Garg
2d1cfae596
fix: fieldname
2020-12-05 22:44:45 +05:30
Anurag Mishra
26b3328af7
fix: leave policy assignment patch ( #24061 )
2020-12-04 19:50:24 +05:30
Rucha Mahabal
288853d8f0
Merge branch 'develop' into patient-history-enhancements
2020-12-01 13:44:16 +05:30
Afshan
ccf5dc66e2
feat: multi-currency payroll ( #23519 )
...
* feat: multi-currency payroll
* fix: refactor and added conditions
* fix: uncommented code
* style: removed comments
* fix: missing argument
* style: styling changes
* fix: test cases
* Update asset_value_adjustment.py
* patch: update columns
* style: formating
* style: formatting
* fix: 1st review
* fix: refactor
* Revert "fix: refactor"
This reverts commit eca0e17d11a192d60f249b2af992971c625aec46.
reverting to previous state
* Revert "fix: 1st review"
This reverts commit 7eac48b102157df4353598f73b2ea97308af436a.
reverting before 1st review
* fix: 2nd review changes
* fix: test cases
* fix: added call to fetch exchange rate
* fix: remove unnecessary code
* fix: refactor
* fix: refactor patch
* fix: refactor
* fix: refactor
* fix: clear test data
* fix: slider
* feat: multi-currency payroll
* fix: refactor and added conditions
* fix: uncommented code
* style: removed comments
* fix: missing argument
* style: styling changes
* fix: test cases
* patch: update columns
* Update asset_value_adjustment.py
* style: formating
* style: formatting
* fix: 1st review
* fix: refactor
* Revert "fix: refactor"
This reverts commit eca0e17d11a192d60f249b2af992971c625aec46.
reverting to previous state
* Revert "fix: 1st review"
This reverts commit 7eac48b102157df4353598f73b2ea97308af436a.
reverting before 1st review
* fix: 2nd review changes
* fix: test cases
* fix: added call to fetch exchange rate
* fix: remove unnecessary code
* fix: refactor
* fix: refactor patch
* fix: refactor
* fix: refactor
* fix: clear test data
* fix: slider
* feat: Added company field in leave encashment and employee benefit
* refactor: Refactored multi-currency payroll patch
* fix: currency column in salary register
* refactor: Refactored code for making bank and return entry against employee advance
* fix: minor cleanup
* fix: fixed translation
* fix: removed salary component type
* fix: fixed sider issues
* fix: translation and slider
* style: formatted msg
* fix: fixed slider
* fix: travis
* fix: refactor
* fix: slider
* fix: slider
* fix: slider
* fix: travis
* fix: patch
* fix: patch
* fix: travis
* fix: travis
* fix: travis
* fix: travis
* fix: travis
* fix: travis
* fix: re-run travis
* fix: rerun travis
* fix: rerun travis
* fix: rerun travis
* fix: travis rerun
* fix: increased throttle_user_limit from 60 to 100
* fix: patch
* fix: patch
* fix: assign payroll payable account as default payroll payable account in SSA
* fix: removed debugger
* fix: slider
Co-authored-by: Anurag Mishra <32095923+Anurag810@users.noreply.github.com>
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2020-12-01 09:11:05 +05:30
Rucha Mahabal
f6756838ba
fix: patch
2020-11-30 17:51:56 +05:30
Rucha Mahabal
7a69a3367c
Merge branch 'develop' into patient-history-enhancements
2020-11-30 14:16:46 +05:30
Rucha Mahabal
f3df5c9f3c
feat: patch to setup standard doctype config in Patient History Settings
2020-11-30 12:16:28 +05:30
Deepesh Garg
452cbcd6ea
fix: Update payments directly in Loan Interest Accrual
2020-11-30 10:55:12 +05:30
Deepesh Garg
681c0e297c
Merge branch 'develop' of https://github.com/frappe/erpnext into loan_patch_fix
2020-11-29 23:07:14 +05:30
Marica
307bd01504
Merge branch 'develop' into pr-dn-return
2020-11-25 17:24:03 +05:30
Anurag Mishra
755b773616
feat: Leave policy assignment ( #23112 )
...
* feat: Leave Policy Assignment
* feat: linking with leave allocation and valiations
* style: removed old code from leave period
* feat: Bulk Leave policy Assignment and grant Leaves
* fix: overlap validation
* feat: earned leaves based on joining date
* feat: automatic grant leave based on leave policy
* patch: create leave policy assignment based on employee current leave policy
* fix: dependent test cases
* test: Leave policy assignment
* fix: some enhancement
* style: break large function into small function
* fix:requested Changes
* fix(patch): Handled old Leave allocatioln
* fix:codacy
* fix: travis and sider,codacy
* fix: codacy
* fix: codacy
* fix: requested changes and sider
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2020-11-25 16:05:17 +05:30
Nabin Hait
93bb7b0000
Merge branch 'develop' into membership-enhancements-2
2020-11-19 13:05:17 +05:30
Marica
9b897c4073
Merge branch 'develop' into pr-dn-return
2020-11-19 12:21:38 +05:30
Suraj Shetty
5e8b00207b
fix: Typo (Enchashment > Encashment) ( #23919 )
2020-11-17 10:58:09 +05:30
Deepesh Garg
a862eb25e6
fix: Make repayment entry only if amount exists
2020-11-13 17:57:57 +05:30
Deepesh Garg
37dc369af9
feat: Sync old shopify orders ( #23841 )
...
* feat: Sync old shopify orders
* fix: Old orders syncing by date
* fix: Remove unnecessary code
* fix: Remove unintentional changes
Co-authored-by: Saurabh <saurabh@erpnext.com>
2020-11-13 16:53:35 +05:30