Nabin Hait
|
0c7448fc41
|
fix: Fixed merge conflict
|
2021-05-01 14:54:22 +05:30 |
|
Nabin Hait
|
a2fcca85a5
|
fix: Fixed merge conflict
|
2021-05-01 14:53:13 +05:30 |
|
Afshan
|
1fd1e2bb60
|
fix: fieldname when updating docfield property (#25517)
|
2021-04-30 18:41:26 +05:30 |
|
Deepesh Garg
|
88d40e8dc4
|
fix: Remove extra space
|
2021-04-30 15:33:33 +05:30 |
|
Deepesh Garg
|
1deef5229e
|
fix: Linting and translation issues
|
2021-04-30 15:20:55 +05:30 |
|
Deepesh Garg
|
bd5ee7d725
|
fix: Use party account currency
|
2021-04-30 15:20:45 +05:30 |
|
Deepesh Garg
|
9cbca06f4e
|
fix: Updated filters for process statement of accounts
|
2021-04-30 15:20:31 +05:30 |
|
Deepesh Garg
|
303f6d2d36
|
Merge branch 'version-13-pre-release' of https://github.com/frappe/erpnext into psoa_fixes_v13_pre_release
|
2021-04-30 15:17:07 +05:30 |
|
Deepesh Garg
|
178938b2f0
|
fix: Ageing errors in PSOA
|
2021-04-30 15:14:24 +05:30 |
|
Deepesh Garg
|
c4231c72a6
|
Merge pull request #25524 from aerele/develop
fix: List invoices in Payment Reconciliation Payment
|
2021-04-30 14:15:33 +05:30 |
|
Anuja P
|
435e93bda9
|
fix: allocated amount change wrt paid amount change
|
2021-04-30 13:52:48 +05:30 |
|
Deepesh Garg
|
8aa57953ee
|
Merge pull request #25490 from deepeshgarg007/psoa_fixes_v2
fix: Ageing errors in PSOA
|
2021-04-30 13:07:00 +05:30 |
|
Deepesh Garg
|
26920b439a
|
Merge pull request #25394 from meike289/feature/check-field-subscription-invoice
feat: new check field in subscriptions for (not) submitting invoices
|
2021-04-30 12:32:45 +05:30 |
|
Deepesh Garg
|
0dc411951e
|
Merge pull request #25438 from nextchamp-saqib/round-off-diff-allowance
fix: ignore fraction difference while making round off gl entry
|
2021-04-30 11:11:21 +05:30 |
|
Vignesh S
|
7783a56c08
|
fix: List invoices in Payment Reconciliation Payment
Invoices are not listed in the Payment Reconciliation Payment table due to a typo in the code
|
2021-04-29 22:39:42 +05:30 |
|
Saqib Ansari
|
6dd1c5cf92
|
refactor: remove extra fields
|
2021-04-29 18:12:36 +05:30 |
|
Saqib Ansari
|
a91eebf6aa
|
feat: base payment amount in payment schedule
|
2021-04-29 18:12:23 +05:30 |
|
Saqib Ansari
|
e70d9c925c
|
fix: payment amount showing in foreign currency
|
2021-04-29 18:12:17 +05:30 |
|
Anuja Pawar
|
07fb98b91d
|
Merge branch 'develop' into fix_PE_allocated_amt
|
2021-04-29 17:17:21 +05:30 |
|
Anuja P
|
dd1e7624bf
|
fix: changing paid amount should change allocated amount
|
2021-04-29 17:00:59 +05:30 |
|
Raffael Meyer
|
d75b4c37a3
|
Merge branch 'develop' into feature/check-field-subscription-invoice
|
2021-04-28 12:38:49 +02:00 |
|
Raffael Meyer
|
a949480acf
|
fix: add translation to make semgrep pass
|
2021-04-28 12:38:23 +02:00 |
|
Saqib Ansari
|
44b07e4ef5
|
refactor: remove extra fields
|
2021-04-28 15:11:57 +05:30 |
|
Saqib Ansari
|
3f7ec95af8
|
Merge branch 'develop' of https://github.com/frappe/erpnext into payment-term-amount-display-currency-fix
|
2021-04-28 14:45:27 +05:30 |
|
Saqib Ansari
|
aa4f750d8c
|
fix: test
|
2021-04-28 14:42:49 +05:30 |
|
Saqib Ansari
|
3f53b87379
|
Merge branch 'develop' of https://github.com/frappe/erpnext into round-off-diff-allowance
|
2021-04-28 14:34:51 +05:30 |
|
Saqib
|
7b3dd3585b
|
fix: unexpected keyword argument 'merge_logs' (#25489)
* fix: unexpected keyword arguement 'merge_logs'
* fix: reference error
* fix: test
|
2021-04-27 20:01:08 +05:30 |
|
Saqib
|
ad4365eb0e
|
fix: unexpected keyword argument 'merge_logs' (#25489)
* fix: unexpected keyword arguement 'merge_logs'
* fix: reference error
* fix: test
|
2021-04-27 20:00:21 +05:30 |
|
Deepesh Garg
|
8a1e5e189c
|
fix: Ageing errors in PSOA
|
2021-04-27 16:57:34 +05:30 |
|
rohitwaghchaure
|
b9078a0c86
|
Merge pull request #25126 from rohitwaghchaure/purchase-invoice-to-purchase-receipt-develop
feat: purchase receipt creation from purchase invoice
|
2021-04-27 09:56:28 +05:30 |
|
Deepesh Garg
|
ebc6c51abe
|
Merge pull request #25384 from deepeshgarg007/psoa_fixes
fix: Updated filters for process statement of accounts
|
2021-04-26 22:58:42 +05:30 |
|
Afshan
|
df06e49e0c
|
feat: enable custom field search on POS (#25421)
* feat: multi lingual item search in POS
* fix: limit the options for selection and broken down funtion for geting condition
|
2021-04-26 22:48:13 +05:30 |
|
Deepesh Garg
|
4c8d15b487
|
fix: Incorrect GL Entry validation (#25474)
* fix: Incorrect GL Entry validation
* fix: Add validation for party accounts
* fix: Scrub labels
* fix: Translation
|
2021-04-26 15:24:34 +05:30 |
|
Deepesh Garg
|
0b9aa58b81
|
Merge branch 'develop' of https://github.com/frappe/erpnext into psoa_fixes
|
2021-04-26 14:51:20 +05:30 |
|
Deepesh Garg
|
968ec110f3
|
fix: Linting and translation issues
|
2021-04-26 14:51:00 +05:30 |
|
Anuja Pawar
|
fee9a56d4e
|
Merge branch 'develop' into fix_allocated_amt_in_PE
|
2021-04-26 11:36:10 +05:30 |
|
Anuja P
|
f74d8d2e16
|
fix: suggested changes
|
2021-04-26 11:31:51 +05:30 |
|
Walstan Baptista
|
4a805b5622
|
chore: frappe.whitelist for doc methods (#25465)
|
2021-04-24 14:23:08 +05:30 |
|
Anuja P
|
dc599e0164
|
fix: to update Allocated amount after Paid Amount is changed
|
2021-04-23 19:24:53 +05:30 |
|
Saqib Ansari
|
d552fe6778
|
feat: base payment amount in payment schedule
|
2021-04-23 14:46:52 +05:30 |
|
Saqib Ansari
|
242242c43f
|
Merge branch 'develop' of https://github.com/frappe/erpnext into payment-term-amount-display-currency-fix
|
2021-04-23 13:54:13 +05:30 |
|
meike289
|
8787ebf83d
|
Apply suggestions from code review
Co-authored-by: Ankush Menat <ankushmenat@gmail.com>
|
2021-04-23 08:06:29 +02:00 |
|
Saqib
|
3d4acf9e5c
|
fix: permission error after submitting exchange rate revaluation (#25432)
|
2021-04-22 16:16:03 +05:30 |
|
Saqib
|
19b73968d7
|
fix(pos): validations & minor ui issues (#25351)
* fix: pos print format
* fix: stock validation on pos invoice creation
|
2021-04-22 13:38:20 +05:30 |
|
Saqib Ansari
|
b0e160ff78
|
fix: ignore fraction difference while making round off gl entry
|
2021-04-22 13:23:50 +05:30 |
|
Mohammad Hasnain Mohsin Rajan
|
7f932cfb30
|
fix: display reconcile tool when closing balance 0 (#25417)
Co-authored-by: Saqib <nextchamp.saqib@gmail.com>
|
2021-04-22 04:53:09 +05:30 |
|
Deepesh Garg
|
e5e20c50a9
|
Merge branch 'develop' into purchase-invoice-to-purchase-receipt-develop
|
2021-04-21 19:09:41 +05:30 |
|
Raffael Meyer
|
48cd4de0d2
|
Merge branch 'develop' into feature/check-field-subscription-invoice
|
2021-04-20 16:15:01 +02:00 |
|
Marica
|
0278646fd8
|
fix: Cashier query in POS Opening/Closing Entry (#25399)
|
2021-04-20 12:53:33 +05:30 |
|
Marica
|
125c3d64a9
|
fix: Cashier query in POS Opening/Closing Entry (#25398)
|
2021-04-20 12:53:22 +05:30 |
|