Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
32,269 Commits 3 Branches 0 Tags 1 GiB
b4d3666e69
Commit Graph

23315 Commits

Author SHA1 Message Date
Shivam Mishra
b4d3666e69 feat: show send acknowledgement button if enabled in settings 2020-08-14 13:46:58 +05:30
Shivam Mishra
e4c58c37c8 feat: allow member creation via API 2020-08-14 13:46:58 +05:30
Shivam Mishra
98bcedd09c feat: create member if not already exists 2020-08-14 13:46:58 +05:30
Shivam Mishra
d7139bbd43 fix: type error 2020-08-14 13:46:58 +05:30
Shivam Mishra
87ddec069e refactor: try block across the function 2020-08-14 13:46:58 +05:30
Shivam Mishra
6fbe9b5404 fix: remove payload 2020-08-14 13:46:58 +05:30
Shivam Mishra
733bde31c9 fix: doctype name in patch 2020-08-14 13:46:58 +05:30
Shivam Mishra
3a67a78ece feat: add custom buttons for invoice and email 2020-08-14 13:46:58 +05:30
Shivam Mishra
8e0314e7f6 feat: separate invoice generation and email 2020-08-14 13:46:58 +05:30
Shivam Mishra
c8d9e7f77b feat: add message field 2020-08-14 13:46:58 +05:30
Shivam Mishra
1678eb9b50 feat: drop payload column 2020-08-14 13:46:58 +05:30
Shivam Mishra
62e344188a feat: update settings and link filters 2020-08-14 13:46:32 +05:30
Shivam Mishra
15340e0c7f feat: send invoice via email 2020-08-14 13:46:32 +05:30
Shivam Mishra
811ac909f9 feat: add auto invoice creation fields and controllers 2020-08-14 13:46:32 +05:30
Shivam Mishra
96dc67c35e feat: add copy button and docs link 2020-08-14 13:46:32 +05:30
Shivam Mishra
3a1868dae8 feat: add item field 2020-08-14 13:46:32 +05:30
Shivam Mishra
a16b24d50a feat: add enable or disable invoicing and print format field 2020-08-14 13:46:32 +05:30
Deepesh Garg
8ca57eb5dd
Merge pull request #23022 from marination/loan-amount 
fix: Validate or Set Loan Amount first
 2020-08-13 19:53:09 +05:30
Afshan
d7d92c520e
fix: removed code relating to standard working hours (#23009) 2020-08-13 19:40:09 +05:30
Deepesh Garg
1151f888ba fix: Set pledge amount before setting loan amount 2020-08-13 18:52:23 +05:30
bhavesh95863
a647bef682
fix: warehouse mandatory even update stock uncheck (#23023) 2020-08-13 17:41:55 +05:30
marination
8264fcd0a5 fix: Only validate repayment if term loan 2020-08-13 12:47:34 +05:30
marination
6988fbb82d fix: Validate or Set Loan Amount first 2020-08-13 12:17:13 +05:30
Anupam Kumar
e447c79f9d
fix: Quotation lost reason options fix (#22814) 
* adding patch and lost reason child tables

* fix: conflict resolved
 2020-08-13 09:20:36 +05:30
Saqib
c7614174d0
fix: cannot change customer fields if credit exhausted (#22838) 
* fix: cannot change customer fields if credit exhausted

* fix: order based on company

* fix: sort current limits w.r.t company before compare

* fix: CustomerCreditLimit Object is not subscriptable
 2020-08-13 09:18:59 +05:30
Nabin Hait
e2ee455acc fix: Calculate taxes if tax is based on item quantity 2020-08-12 20:58:03 +05:30
Deepesh Garg
21a220e2a5
fix: Update state code and union territory for Daman and Diu (#22988) 
Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
 2020-08-12 19:19:03 +05:30
Rucha Mahabal
cd5821e00a
Merge pull request #23011 from ruchamahabal/fix-asset-maintenance-status 
fix: don't set asset maintenance log status as Overdue when Completed or Cancelled
 2020-08-12 19:17:33 +05:30
Rucha Mahabal
517a6d0054 fix: set draft indicators for Asset Maintenance Log listview 2020-08-12 18:01:45 +05:30
Rucha Mahabal
691ec1bd27 fix: don't set maintenance log status as Overdue when Completed or Cancelled 2020-08-12 18:01:07 +05:30
Anupam Kumar
674d1b0803
feat: Material Request and Stock Entry Enhancement (#22671) 
* feat: send to warehouse

* adding warehouse validation

* fix: review changes

* fix: review changes

* stock entry enhancement

* fix: review changes
 2020-08-12 17:55:02 +05:30
Rucha Mahabal
e0cc421e50
fix: TypeError while setting transfer_qty in Stock Entry (#22929) 
Co-authored-by: Marica <maricadsouza221197@gmail.com>
 2020-08-12 14:33:30 +05:30
Marica
846771cb29
Merge branch 'develop' into item-image-alt 2020-08-12 13:37:19 +05:30
Deepesh Garg
1d5ab618d2
Merge pull request #23001 from nabinhait/inclusive-tax-based-on-item-quantity 
fix: Calculate taxes if tax is based on item quantity and inclusive on item price
 2020-08-11 22:05:02 +05:30
Deepesh Garg
7d0a625b9c
git commit -m "fix: Add missing semicolon" 2020-08-11 22:02:12 +05:30
Nabin Hait
19ea7218d9 fix: Calculate taxes if tax is based on item quantity and inclusive on item price 2020-08-11 20:34:57 +05:30
Afshan
ba33900712 Merge remote-tracking branch 'upstream/develop' into fix-duplicate-dropdown-PO 2020-08-11 20:17:05 +05:30
Afshan
b5b2586968 fix: referencing frm 2020-08-11 20:15:57 +05:30
Shivam Mishra
2fe5d76fe4
Merge branch 'develop' into item-image-alt 2020-08-11 14:45:55 +00:00
Deepesh Garg
ca9038feb7
Merge pull request #22998 from abhishekbalam/rename_source_section_opportunity 
fix(CRM): Change 'Source' section name to 'More Information' in Opportunity
 2020-08-11 18:26:09 +05:30
Anurag Mishra
ed6e9550ca
fix: removed payroll from HR. (#22991) 
Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
 2020-08-11 18:04:42 +05:30
Abhishek Balam
d0ae92d4bd fix: moved company field, renamed to 'More Information' 2020-08-11 17:39:17 +05:30
Abhishek Balam
ee5b9c7691
feat(Accounting): Process Statement Of Accounts (#22901) 
* feat: Process Statement Of Accounts initial commit

* fix: add jinja supported inputs for subject and body in email settings

* feat: utils support in template, tested autoemail, fixed issues
 2020-08-11 16:23:47 +05:30
Abhishek Balam
9f6d114265 fix: Change Source section name to 'Company Information' 2020-08-11 16:16:05 +05:30
Anupam Kumar
79d731dcd8
feat: Naming series for Sales/Purchase Return (#22942) 
* feat: adding return naming series

* Update purchase_invoice.json

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
 2020-08-11 16:11:20 +05:30
Deepesh Garg
145b80b11c
Merge pull request #22987 from frappe/fix-company-field 
fix: Consistent capitalization
 2020-08-11 16:09:27 +05:30
Deepesh Garg
2621016884
fix: Allocated advance amount for multi-currency payment (#22923) 
* fix: Allocated advance amount for multicurrency payment

* fix: Get grand total based on party currency

* fix: Remove unwanted code
 2020-08-11 16:06:13 +05:30
Abhishek Balam
ef3b82dae2
fix(CRM): Move Source section above Follow Up section In Opportunity (#22974) 
* fix: move source section above follow up

* fix: only moving source field to 1st section
 2020-08-11 16:05:02 +05:30
Shivam Mishra
3325be1d87
fix: spacing for slideshow (#22996) 2020-08-11 16:03:46 +05:30
Deepesh Garg
285e059394
Merge pull request #22997 from abhishekbalam/set_opportunity_status_to_converted 
fix(CRM): Change Opportunity to 'Converted' when Sales Order is created
 2020-08-11 16:00:16 +05:30