Commit Graph

40943 Commits

Author SHA1 Message Date
Afshan
c42318ec24 chores: clean up 2021-04-09 17:44:30 +05:30
Anupam Kumar
f52f2b2f17 Merge branch 'develop' into email-digest 2021-04-09 17:24:43 +05:30
Ankush Menat
5451bbf7d2 fix: condition for SLA status banner
If the document is NOT in the closed state and fulfilled then there
won't be any banner. This bug was introduced while fixing a bug related
to buttons, so separated out code for showing buttons and showing
banners.
2021-04-09 17:19:02 +05:30
rohitwaghchaure
526f76c27d Merge pull request #25257 from rohitwaghchaure/travis-fix-for-project
fix: travis
2021-04-09 17:07:22 +05:30
Afshan
31b5dfe9ee feat: Dimension-wise Accounts Balance Report 2021-04-09 16:52:14 +05:30
Rohit Waghchaure
ca5e10892c fix: travis 2021-04-09 16:23:45 +05:30
Afshan
dc73a9995d Merge branch 'develop' into add-blank-for-status-issue-reports 2021-04-09 13:04:34 +05:30
Marica
c6b3766fb2 Merge pull request #24921 from Anurag810/item-dashboard-fixes
fix: precision and formatted document for stock level in item dashboard.
2021-04-09 12:43:06 +05:30
Saqib Ansari
032246dc2b feat(italy): add document type field for e-invoicing 2021-04-09 12:08:24 +05:30
Marica
d38618fc34 Merge branch 'develop' into item-dashboard-fixes 2021-04-09 11:57:56 +05:30
Marica
5467d7c3e3 fix: Use system precision instead of SLE precision 2021-04-09 11:56:49 +05:30
Marica
a7ac01153e fix: Remove redundant import and import cint 2021-04-09 11:55:44 +05:30
Marica
ad75944960 Merge pull request #25105 from Anuja-pawar/fix_picked_qty_in_DN
fix: Picked Qty conversion from Stock Qty to Qty while creating DN from Pick List
2021-04-09 11:48:56 +05:30
Saqib Ansari
e7813b69c4 fix: condition for setting agreement status 2021-04-09 11:46:16 +05:30
Marica
b89a40aa3c Merge branch 'develop' into fix_picked_qty_in_DN 2021-04-09 11:45:39 +05:30
Marica
7f0e92c9b9 Merge pull request #25232 from nextchamp-saqib/coa-importer-validate-fix
fix: keyerror while validating coa file
2021-04-09 11:44:40 +05:30
Deepesh Garg
63e6036d12 Merge pull request #25235 from ankush/remove_purch_inv_validation
fix: remove gst name validation for purchase Invoice
2021-04-09 10:48:34 +05:30
barredterra
e66cf0aa44 fix: hanging indent 2021-04-08 18:26:45 +02:00
barredterra
0a45fc8c58 fix: remove unused import 2021-04-08 18:25:17 +02:00
barredterra
3a12f1f1ae fix: prettier error log 2021-04-08 17:53:48 +02:00
Saqib
4191e7999d chore: add error title
Co-authored-by: Marica <maricadsouza221197@gmail.com>
2021-04-08 21:04:56 +05:30
barredterra
ea0fd31f60 Merge branch 'datev_fixes' of https://github.com/alyf-de/erpnext into datev_fixes 2021-04-08 17:25:54 +02:00
Raffael Meyer
3b4b17476a Merge branch 'develop' into datev_fixes 2021-04-08 17:25:12 +02:00
Deepesh Garg
edb4663258 Merge pull request #25251 from nextchamp-saqib/einv-ack-no-fix
fix(india): set correct ack no. on irn generation
2021-04-08 20:48:01 +05:30
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
barredterra
368a6541e9 fix: Debtor/Creditor Number is not translatable 2021-04-08 16:26:56 +02:00
Saqib Ansari
30720d2139 fix: set correct ack no. on irn generation 2021-04-08 19:06:44 +05:30
Rucha Mahabal
b7aa658a51 refactor(HR): Add missing reports and doctypes to the Workspace (#24994)
* refactor(HR): Add missing reports and doctypes to the Workspace

* refactor: remove Employee Tax and Benefits from HR Workspace

Co-authored-by: Anurag Mishra <32095923+Anurag810@users.noreply.github.com>
2021-04-08 18:13:21 +05:30
marination
6d85e821c1 fix: Sider and Tests 2021-04-08 17:23:39 +05:30
Jannat Patel
d9fa79de99 fix: serial no refresh issue (#25127)
* fix: serial no refresh issue

* fix: sider
2021-04-08 16:04:57 +05:30
Anupam Kumar
9d830255c1 Merge branch 'develop' into se-add-to-transit 2021-04-08 14:44:08 +05:30
rohitwaghchaure
f9fde054e1 Merge pull request #25242 from rohitwaghchaure/fixed-test-case-for-bom-cost
fix: bom cost test case
2021-04-08 14:39:08 +05:30
Marica
6a98d39201 Merge branch 'develop' into fixed-incorrect-batch-selected-in-purchase-rceipt-develop 2021-04-08 13:57:35 +05:30
HENRY Florian
e286750a0f fix: UOM length unit in global setup list is empty (#24855)
* When ERPNext is installed in localized language the category of UOM Conversion Factor is tranlasted into installed languaes. Filter must be locallized

* fix

* fix

Co-authored-by: Marica <maricadsouza221197@gmail.com>
2021-04-08 13:56:29 +05:30
Marica
fb9fc944c5 Merge branch 'develop' into coa-importer-validate-fix 2021-04-08 13:46:42 +05:30
Rohit Waghchaure
fa8bb87a86 fix: bom cost test case 2021-04-08 13:38:22 +05:30
rohitwaghchaure
5d3f665cc5 Merge pull request #25240 from ankush/job_card_rounding
fix: round total quantity in job card
2021-04-08 13:10:09 +05:30
Ankush Menat
cb625d868c fix: round total quantity in job card 2021-04-08 12:05:52 +05:30
Saqib
f10d107a0a Merge branch 'develop' into coa-importer-validate-fix 2021-04-08 11:25:29 +05:30
Anupam Kumar
281eade019 Merge branch 'develop' into email-digest 2021-04-08 10:58:33 +05:30
Anupam Kumar
dfdf72cbb2 Merge branch 'develop' into planning 2021-04-08 10:58:05 +05:30
Anupam Kumar
8edf9d23c0 Merge branch 'develop' into se-add-to-transit 2021-04-08 10:57:50 +05:30
marination
aff53b762e Merge branch 'develop' of https://github.com/frappe/erpnext into e-commerce-refactor 2021-04-08 00:06:05 +05:30
marination
be68f75348 feat: Customer Ratings & Reviews Full Page
- Created macros for repetitive snippets
- Created Customer Reviews full page
- View more button to reveal 10 more reviews at a time
- Common function to get reviews with start and end
2021-04-07 23:49:04 +05:30
barredterra
94f293940c fix: better party export 2021-04-07 20:06:16 +02:00
barredterra
4fe2d35b2e feat: more infos for transactions 2021-04-07 20:05:41 +02:00
barredterra
b39608a02e fix: handle encoding errors
replace unknown characters by '?'
2021-04-07 20:04:38 +02:00
barredterra
6b2e4f2b5d feat: add custom field debtor_creditor_number to Party Account 2021-04-07 20:03:59 +02:00