Saqib
d82b76fe0a
fix: pos item search includes non stock items ( #23914 )
...
* fix: pos item search includes non stock items
* chore: add validation for non stock items
2020-11-18 11:56:49 +05:30
Deepesh Garg
350972ece4
fix: Account filters
2020-11-17 13:51:58 +05:30
Deepesh Garg
8b4d92d4fc
fix: Disable filters after test
2020-11-17 13:19:29 +05:30
Deepesh Garg
6456c3dc24
fix: Linting and test cases
2020-11-17 11:10:00 +05:30
Deepesh Garg
4bd52b4842
fix: Add test case
2020-11-16 23:01:36 +05:30
Deepesh Garg
d82c0f3bea
fix: Add disable and mandatory check for accounting dimension filters
2020-11-16 20:32:16 +05:30
Mohammad Hasnain
d2477e6cc5
fix(UAE VAT 201): remove branch parts
2020-11-16 18:47:05 +05:30
Mohammad Hasnain
2e1787300d
feat(UAE VAT 201): emirate according to branch
2020-11-16 17:36:27 +05:30
Marica
06f522cb27
Merge branch 'develop' into naming-series-proj
2020-11-16 13:32:24 +05:30
Deepesh Garg
0c6319194e
fix: GL Entry validation for dimensions
2020-11-16 13:20:19 +05:30
marination
d51c953c22
chore: Fix Tests, use project name instead of project_name field
2020-11-16 12:48:40 +05:30
rohitwaghchaure
6094d66a6d
Merge pull request #23636 from marination/item-price-pricing-rule-conflict
...
fix: Dont overrule Item Price via Pricing Rule Rate if 0
2020-11-16 12:22:30 +05:30
Deepesh Garg
9e9ea96582
fix: linting
2020-11-16 12:03:47 +05:30
Deepesh Garg
1f9b03345d
fix: Remove project filter
2020-11-16 09:55:35 +05:30
Deepesh Garg
f916bc048f
fix: Remove cost center query from doctypes
2020-11-15 22:44:39 +05:30
Deepesh Garg
96e874bfda
fix: dimension filter query
2020-11-15 22:43:01 +05:30
Deepesh Garg
8b6370bb45
feat: Add accounting dimension filter doctype
2020-11-15 22:41:36 +05:30
Raffael Meyer
7178df8567
fix: improve UX of DATEV report ( #23892 )
...
* feat(DATEV Settings): button to show report
* feat(desk): add DATEV to Reports under Accounting
* fix(report DATEV): last calendar month as default
* fix: let user create DATEV Settings
(Instead of showing an error message.)
2020-11-15 09:45:10 +05:30
Raffael Meyer
4bf09dd02b
fix: fiscal year can be shorter than 12 months ( #23838 )
...
* fix: replace unnecessary SQL query
* feat: checkbox "Is Short Year"
Also, set checkbox and dates only once.
* fix: toggle no longer necessary
Date fields use set_only_once.
* feat: short years can be less than 12 months
* fix: if short year, don't add 12 months to start date
* test: short year
* fix: move short fiscal year to test records
2020-11-15 09:32:24 +05:30
Shivam Mishra
bed717b442
Merge branch 'develop' of https://github.com/frappe/erpnext into rebrand-ui
2020-11-12 11:32:59 +05:30
Marica
2b44f22cf4
Merge branch 'develop' into fix-po-no-fetching
2020-11-11 11:10:34 +05:30
Mohammad Hasnain Mohsin Rajan
72adb0b218
Merge branch 'develop' into UAE-VAT-Format
2020-11-10 09:58:45 +05:30
Anurag Mishra
91fdb7aa69
feat: added column cost_center to receivable reports ( #23835 )
2020-11-09 20:20:05 +05:30
Marica
9a3e1f6f83
Merge branch 'develop' into purchase-invoice-payment-terms
2020-11-09 14:51:20 +05:30
Marica
63d1a0436c
Merge branch 'develop' into fix-po-no-fetching
2020-11-09 12:59:10 +05:30
Marica
f72a5a6dca
Merge branch 'develop' into pr-dn-return
2020-11-09 12:19:36 +05:30
Marica
709daf354b
Merge branch 'develop' into purchase-invoice-payment-terms
2020-11-09 10:33:32 +05:30
Marica
da2c6444f6
Merge branch 'develop' into bank-link-card-desk
2020-11-09 10:29:51 +05:30
Mohammad Hasnain Mohsin Rajan
d54969bd86
Merge branch 'develop' into UAE-VAT-Format
2020-11-06 23:39:34 +05:30
Mohammad Hasnain
c5aad7b6e5
feat(UAE VAT 201): reorder desk page listing
2020-11-06 23:36:50 +05:30
Mohammad Hasnain
4d99d695a3
feat(uae vat 201): update desk page entry
2020-11-06 23:33:19 +05:30
Saqib
e0af8fe8e5
fix: auto fetch sr nos with modifed conversion factor ( #23854 )
2020-11-06 18:19:36 +05:30
marination
0b4946ba27
fix: Add missing links
...
- Added Bank Transaction Statement Entry and Bank Statement Settings
2020-11-06 13:15:46 +05:30
Nabin Hait
06ba92be7a
fix: Added link of bank reconciliation and clearance in accounting desk page
2020-11-06 13:15:38 +05:30
Marica
7e1511f527
Merge branch 'develop' into purchase-invoice-payment-terms
2020-11-06 12:28:55 +05:30
Anupam
c3307f7900
fix: replaced formatdate -> format_date
2020-11-06 12:28:38 +05:30
Marica
d845e8a53a
Merge branch 'develop' into pr-dn-return
2020-11-06 12:25:11 +05:30
Marica
9694432270
Merge branch 'develop' into dialog-cleanup
2020-11-06 12:19:41 +05:30
Anupam Kumar
3a9dc90695
fix: fix: replaced formatdate -> format_date ( #23829 )
2020-11-05 18:51:56 +05:30
Marica
6d2bcd2404
Merge branch 'develop' into purchase-invoice-payment-terms
2020-11-05 12:25:38 +05:30
Marica
a45f98ba99
Merge branch 'develop' into pr-dn-return
2020-11-05 10:34:23 +05:30
Marica
144fef0097
Merge branch 'develop' into item-price-pricing-rule-conflict
2020-11-05 09:28:30 +05:30
Marica
364916fa7b
Merge branch 'develop' into dialog-cleanup
2020-11-05 09:27:57 +05:30
rohitwaghchaure
a53454d3d1
Update test_budget.py
2020-11-04 12:06:21 +05:30
marination
574477187f
chore: Pricing Rule with Item Price Test
2020-11-03 20:22:48 +05:30
Marica
cf08f0da70
Merge branch 'develop' into item-price-pricing-rule-conflict
2020-11-03 18:29:22 +05:30
Rohit Waghchaure
c8cc4bfc56
fix: Budget test cases
2020-11-03 17:09:09 +05:30
marination
53b1a9a40b
chore: Add Test for missing debit account
2020-11-03 15:56:09 +05:30
Marica
9a75a60784
Merge branch 'develop' into debit-credit-opening-invoice-tool
2020-11-03 12:03:50 +05:30
marination
28dd90f3dc
Merge branch 'develop' of https://github.com/frappe/erpnext into pr-dn-return
2020-11-02 15:16:31 +05:30
