Mohammad Hasnain
|
510d0d3f20
|
Merge branch 'UAE-VAT-Format' of https://github.com/hasnain2808/erpnext into UAE-VAT-Format
|
2020-11-04 10:32:22 +05:30 |
|
Mohammad Hasnain
|
f2c895ddb5
|
feat(uae vat 201): do not take zero and nil rated items in standard rated expense emiratewise
|
2020-11-04 10:31:37 +05:30 |
|
Mohammad Hasnain Mohsin Rajan
|
2b2961678c
|
Merge branch 'develop' into UAE-VAT-Format
|
2020-11-04 08:43: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 |
|
pateljannat
|
846ff323e2
|
feat: sales order status filter for production plan
|
2020-11-03 17:35:44 +05:30 |
|
Rohit Waghchaure
|
c8cc4bfc56
|
fix: Budget test cases
|
2020-11-03 17:09:09 +05:30 |
|
Marica
|
7b42e8e27c
|
Merge branch 'develop' into dialog-cleanup
|
2020-11-03 16:26:06 +05:30 |
|
Rucha Mahabal
|
b7e84f70c9
|
Merge pull request #23799 from ruchamahabal/fix-ipme
fix: Inpatient Medication Order and Entry fixes
|
2020-11-03 15:43:06 +05:30 |
|
Rucha Mahabal
|
ce8b5fc5ca
|
Merge branch 'develop' into fix-ipme
|
2020-11-03 13:56:53 +05:30 |
|
Rucha Mahabal
|
7190e1e4bb
|
fix: Inpatient Medication Order and Entry fixes
|
2020-11-03 13:45:12 +05:30 |
|
Saqib
|
da878c43fc
|
fix: cannot save customer email & phone (#23797)
|
2020-11-03 10:51:09 +05:30 |
|
Saqib
|
c95dff7b7d
|
fix: cannot add items to cart (#23796)
* fix: _ is not defined
* fix: item image alt gets overflowed due to large text
* fix: available item qty in pos search
* fix: cash shortcuts overflow
|
2020-11-03 10:16:58 +05:30 |
|
Kevin Chan
|
a2ba8ea74a
|
style: Clean up code formatting
|
2020-11-03 10:57:52 +08:00 |
|
Kevin Chan
|
312561fd77
|
Merge branch 'develop' into fix/item-price-duplicate-checking
|
2020-11-03 10:56:23 +08:00 |
|
Mohammad Hasnain Mohsin Rajan
|
6a0b28bde3
|
Merge branch 'develop' into UAE-VAT-Format
|
2020-11-02 23:59:13 +05:30 |
|
Mohammad Hasnain
|
7a034595fe
|
fix(UAE VAT 201): Remove Chart
|
2020-11-02 13:12:27 +05:30 |
|
Mohammad Hasnain
|
b0eca23485
|
Refactor(UAE VAT 201): Fix fomatiing
|
2020-11-02 12:47:10 +05:30 |
|
Deepesh Garg
|
992bd69fc4
|
Merge pull request #23785 from deepeshgarg007/place_of_supply
fix: Place of Supply fix in Sales Invoices
|
2020-11-02 11:23:25 +05:30 |
|
Mohammad Hasnain
|
c53237f5e0
|
refactor(UAE VAT 201): solve syntax errors
|
2020-11-02 11:02:41 +05:30 |
|
Mohammad Hasnain Mohsin Rajan
|
c8d8d0868d
|
Merge branch 'develop' into UAE-VAT-Format
|
2020-11-02 10:36:03 +05:30 |
|
Mohammad Hasnain Mohsin Rajan
|
d322181fd7
|
refactor(UAE VAT 201): Update erpnext/regional/report/uae_vat_201/uae_vat_201.py
Co-authored-by: Shivam Mishra <scmmishra@users.noreply.github.com>
|
2020-11-02 10:29:38 +05:30 |
|
Mohammad Hasnain Mohsin Rajan
|
7b771d139c
|
refactor(UAE VAT 201): Update erpnext/regional/report/uae_vat_201/test_uae_vat_201.py
Co-authored-by: Shivam Mishra <scmmishra@users.noreply.github.com>
|
2020-11-02 10:29:14 +05:30 |
|
Mohammad Hasnain Mohsin Rajan
|
46265d3fc7
|
refactor(UAE VAT 201): Update erpnext/regional/report/uae_vat_201/test_uae_vat_201.py
Co-authored-by: Shivam Mishra <scmmishra@users.noreply.github.com>
|
2020-11-02 10:28:41 +05:30 |
|
Mohammad Hasnain Mohsin Rajan
|
be7a4c8b0a
|
refactor(UAE VAT 201): Update erpnext/regional/report/uae_vat_201/test_uae_vat_201.py
Co-authored-by: Shivam Mishra <scmmishra@users.noreply.github.com>
|
2020-11-02 10:28:14 +05:30 |
|
Mohammad Hasnain Mohsin Rajan
|
f116fbf84d
|
refactor(UAE VAT 201): Update erpnext/regional/report/uae_vat_201/test_uae_vat_201.py
Co-authored-by: Shivam Mishra <scmmishra@users.noreply.github.com>
|
2020-11-02 10:27:54 +05:30 |
|
marination
|
542ae6ab97
|
chore: Linter and Sider fixes
- Translatable strings cannot be multi line or be formatted by '+'
- Reduce no of tabs in stock_entry.js
|
2020-11-02 08:50:48 +05:30 |
|
Deepesh Garg
|
eacfd792e6
|
fix: fieldname
|
2020-10-30 22:12:24 +05:30 |
|
Deepesh Garg
|
db3fa4e6b2
|
fix: Place of Supply fix in Sales Invoices
|
2020-10-30 19:19:48 +05:30 |
|
marination
|
97d38548aa
|
chore: Purchase Invoice Get Items From cleanup
|
2020-10-30 17:50:25 +05:30 |
|
marination
|
66b2b544f8
|
chore: Purchase Receipt, added required by date in PO popup
|
2020-10-30 17:45:28 +05:30 |
|
marination
|
08e5031be2
|
chore: Supplier Quotation Get Items From cleanup
|
2020-10-30 17:36:20 +05:30 |
|
marination
|
e14fdf4a3c
|
chore: RFQ cleanup and Title case for 'Get Items From'
- Cleanup up RFQ Get Items From Dialogs
- Title cased 'Get items from' to 'Get Items From'
|
2020-10-30 17:06:00 +05:30 |
|
rohitwaghchaure
|
c451c08824
|
Merge pull request #23777 from rohitwaghchaure/fixed-set-po-details-in-subcontract-stock-entry-develop
fix: po_detail field has no value for subcontracted stock entry
|
2020-10-30 16:48:11 +05:30 |
|
rohitwaghchaure
|
ce7f9dffa9
|
Merge pull request #23781 from rohitwaghchaure/patch-to-update-reason-for-leaving
fix: patch to update reason for leaving in employee
|
2020-10-30 16:47:48 +05:30 |
|
Rohit Waghchaure
|
e1781dc0bb
|
fix: patch to update reason for leaving in employee
|
2020-10-30 15:34:04 +05:30 |
|
Saqib
|
32442008dc
|
fix: asset finance book posting date fix (#23778)
|
2020-10-30 15:30:18 +05:30 |
|
Rohit Waghchaure
|
71913c36a7
|
fix: po_detail field has no value for subcontracted stock entry
|
2020-10-30 14:35:16 +05:30 |
|
rohitwaghchaure
|
2160050c82
|
Merge pull request #23728 from marination/prod-plan-status
feat: Close Production Plan
|
2020-10-30 14:23:25 +05:30 |
|
marination
|
6bf507a54b
|
chore: (MR)Added delivery date in SO dialog
|
2020-10-30 13:59:47 +05:30 |
|
Marica
|
b05318aa51
|
Merge branch 'develop' into prod-plan-status
|
2020-10-30 12:33:27 +05:30 |
|
Mohammad Hasnain Mohsin Rajan
|
30197d7fba
|
Merge branch 'develop' into UAE-VAT-Format
|
2020-10-30 10:29:56 +05:30 |
|
rohitwaghchaure
|
707788da4b
|
Merge pull request #22711 from rohitwaghchaure/multiple-pricing-rules-are-not-applied
fix: multiple pricing rules are not working on selling side
|
2020-10-30 02:42:51 +05:30 |
|
Marica
|
9dc4941072
|
Merge branch 'develop' into prod-plan-status
|
2020-10-30 00:53:10 +05:30 |
|
François de Ryckel
|
ca5f5cb367
|
Update student_attendance.py (#23761)
Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
|
2020-10-29 23:04:13 +05:30 |
|
Rucha Mahabal
|
9db26155ad
|
fix: set SLA variance in seconds for Duration fieldtype (#23765)
* fix: calculate SLA variance in seconds for Duration fieldtype
* fix: sider
|
2020-10-29 22:39:21 +05:30 |
|
rohitwaghchaure
|
445d23223b
|
Merge branch 'develop' into multiple-pricing-rules-are-not-applied
|
2020-10-29 22:25:19 +05:30 |
|
Anupam Kumar
|
e43f8f12d5
|
Merge branch 'develop' into project-timesheet
|
2020-10-29 22:03:31 +05:30 |
|
Anupam
|
9002904131
|
feat: added project link in timesheet form
|
2020-10-29 21:36:31 +05:30 |
|
Deepesh Garg
|
9c67629e28
|
fix: Ignore cancelled entries instock balance report (#23757)
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
|
2020-10-29 19:51:57 +05:30 |
|