rohitwaghchaure
|
9e0f752fba
|
Merge pull request #23911 from rohitwaghchaure/not-able-to-save-bom-v13-pre
fix: not able to save bom
|
2020-11-14 14:32:02 +05:30 |
|
Rohit Waghchaure
|
30c704a4cb
|
fix: not able to save bom
|
2020-11-14 07:15:19 +05:30 |
|
rohitwaghchaure
|
a8eedb057b
|
Merge pull request #23910 from rohitwaghchaure/not-able-to-save-bom
fix: not able to save bom
|
2020-11-14 07:12:22 +05:30 |
|
Rohit Waghchaure
|
4abc5657ab
|
fix: not able to save bom
|
2020-11-13 22:18:48 +05:30 |
|
Deepesh Garg
|
a862eb25e6
|
fix: Make repayment entry only if amount exists
|
2020-11-13 17:57:57 +05:30 |
|
Afshan
|
3e7f7e3374
|
Merge branch 'fix-payroll-attendance' of https://github.com/AfshanKhan/erpnext into fix-payroll-attendance
Merge branch 'fix-payroll-attendance' of https://github.com/AfshanKhan/erpnext into fix-payroll-attendance
|
2020-11-13 17:04:18 +05:30 |
|
Afshan
|
1a4cafb97d
|
fix: change query to frappe.get_all
|
2020-11-13 17:04:05 +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 |
|
Marica
|
510b389838
|
Merge branch 'develop' into naming-series-proj
|
2020-11-13 13:37:19 +05:30 |
|
Afshan
|
5cffb6c72f
|
Merge branch 'develop' into fix-payroll-attendance
|
2020-11-13 13:01:51 +05:30 |
|
Deepesh Garg
|
78690af440
|
fix: Update only if loans to close
|
2020-11-12 18:47:34 +05:30 |
|
Deepesh Garg
|
c51b340ddf
|
fix: Update closed loans
|
2020-11-12 18:43:43 +05:30 |
|
Anurag Mishra
|
2f5d896f8c
|
fix: added wrong absent days calculation in salary slip
|
2020-11-12 16:57:42 +05:30 |
|
Deepesh Garg
|
b58dca8d94
|
fix: Only update open loans
|
2020-11-12 13:37:11 +05:30 |
|
Shivam Mishra
|
dc1e240642
|
Merge branch 'rebrand-ui' of https://github.com/frappe/erpnext into rebrand-ui
|
2020-11-12 11:33:47 +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 |
|
Jannat Patel
|
0ea0a7495c
|
fix: making company address read-only in delivery note (#23890)
|
2020-11-12 11:10:59 +05:30 |
|
marination
|
c1b0e65f9f
|
feat: Putaway
|
2020-11-12 09:54:44 +05:30 |
|
Rucha Mahabal
|
2baf45496a
|
Merge pull request #23805 from pateljannat/production-planning-status-filter
feat: sales order status filter added for production plan
|
2020-11-11 23:18:22 +05:30 |
|
Rucha Mahabal
|
159d3bf14b
|
Merge branch 'develop' into production-planning-status-filter
|
2020-11-11 22:36:21 +05:30 |
|
Deepesh Garg
|
5e0f4e2f4b
|
Merge pull request #23582 from deepeshgarg007/loan_repayment_type_remove
fix: Loan repayment type option remove
|
2020-11-11 22:08:41 +05:30 |
|
Marica
|
d50874f0c7
|
Merge pull request #23729 from AfshanKhan/fix-po-no-fetching
fix: copying po no when mapping doc
|
2020-11-11 17:44:05 +05:30 |
|
Marica
|
a8ac101f5c
|
Merge branch 'develop' into fix-po-no-fetching
|
2020-11-11 16:55:13 +05:30 |
|
Jannat Patel
|
a9e02bba77
|
Merge branch 'develop' into purchase-taxes-and-charges-account-name-issue
|
2020-11-11 16:46:01 +05:30 |
|
Mangesh-Khairnar
|
a91b68c868
|
feat: add communication channel to communication medium (#23793)
Co-authored-by: Saqib <nextchamp.saqib@gmail.com>
Co-authored-by: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>
|
2020-11-11 16:34:43 +05:30 |
|
Afshan
|
6c95bc5e11
|
fix: payroll attendance error
|
2020-11-11 15:13:38 +05:30 |
|
Deepesh Garg
|
a2dc1740df
|
fix: Use autoname for loan creation
|
2020-11-11 13:57:10 +05:30 |
|
Deepesh Garg
|
0dc052e635
|
fix: Return loan type name
|
2020-11-11 12:57:16 +05:30 |
|
Marica
|
78cccbe015
|
Merge branch 'develop' into fix-po-no-fetching
|
2020-11-11 12:18:14 +05:30 |
|
Rushabh Mehta
|
780b6b466b
|
fix(hooks): include js/css with full path
|
2020-11-11 11:44:28 +05:30 |
|
Marica
|
2b44f22cf4
|
Merge branch 'develop' into fix-po-no-fetching
|
2020-11-11 11:10:34 +05:30 |
|
Deepesh Garg
|
13d1dda74b
|
fix: Handle loan type naming collisions
|
2020-11-11 11:07:17 +05:30 |
|
Jannat Patel
|
e008f85816
|
Merge branch 'develop' into production-planning-status-filter
|
2020-11-11 10:00:39 +05:30 |
|
pateljannat
|
7e4d115e36
|
fix: sider issues fixed
|
2020-11-11 09:52:27 +05:30 |
|
Deepesh Garg
|
73bde45bc5
|
fix: Pass updated loan type
|
2020-11-10 22:08:02 +05:30 |
|
Deepesh Garg
|
1c969d64a2
|
fix: Handle cases where same loan type is used for multiple companies
|
2020-11-10 20:25:35 +05:30 |
|
pateljannat
|
b648b9cf93
|
fix: code review changes
|
2020-11-10 18:50:02 +05:30 |
|
pateljannat
|
d08c91673a
|
fix: removed unnecessary filter options
|
2020-11-10 18:04:30 +05:30 |
|
Deepesh Garg
|
101bad3ea1
|
fix: Remarks for penalty GL Entry
|
2020-11-10 17:53:50 +05:30 |
|
prssanna
|
922432616f
|
Merge branch 'rebrand-ui' of https://github.com/frappe/erpnext into rebrand-ui
|
2020-11-10 17:24:15 +05:30 |
|
prssanna
|
e3b71b9b24
|
fix: compact item print style
|
2020-11-10 17:23:24 +05:30 |
|
Deepesh Garg
|
cd15956d80
|
Merge pull request #23870 from frappe/barredterra-patch-2
fix: remove check for exempt_from_sales_tax
|
2020-11-10 15:28:27 +05:30 |
|
Afshan
|
1e564bc02d
|
fix: refactor
|
2020-11-10 13:23:59 +05:30 |
|
Afshan
|
a75708b02e
|
Merge branch 'fix-po-no-fetching' of https://github.com/AfshanKhan/erpnext into fix-po-no-fetching
|
2020-11-10 13:19:53 +05:30 |
|
Afshan
|
1924019531
|
fix: refactor
|
2020-11-10 13:19:21 +05:30 |
|
Mohammad Hasnain Mohsin Rajan
|
72adb0b218
|
Merge branch 'develop' into UAE-VAT-Format
|
2020-11-10 09:58:45 +05:30 |
|
Raffael Meyer
|
57ce0462d9
|
fix: remove check for exempt_from_sales_tax
|
2020-11-09 19:04:46 +01:00 |
|
Anurag Mishra
|
91fdb7aa69
|
feat: added column cost_center to receivable reports (#23835)
|
2020-11-09 20:20:05 +05:30 |
|
Raffael Meyer
|
4f880e7454
|
refactor: zip_and_download (#23844)
|
2020-11-09 20:17:56 +05:30 |
|
Shivam Mishra
|
f38a1c305e
|
refactor: show form buttons only if permissions exist (#23851)
* refactor: show form buttons only if permissions exist
* style: add semicolon
* fix: typo in conditions
|
2020-11-09 20:16:28 +05:30 |
|