Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
35,031 Commits 3 Branches 0 Tags 1 GiB
82d0a1a13e
Commit Graph

35031 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Suraj Shetty
82d0a1a13e style: Add missing semicolons 
- & make formatting consistent
 2021-04-13 12:35:42 +05:30
Rushabh Mehta
ff935b4586 fix(minor): fix dynamically changing grid properties 2021-04-13 12:09:36 +05:30
Rushabh Mehta
3c58fd4d5e fix(minor): fix dynamically changing grid properties 2021-04-13 12:05:10 +05:30
Rushabh Mehta
65f25c27b3 fix(minor): fix dynamically changing grid properties 2021-04-13 11:58:16 +05:30
Ankush Menat
34d00772e7
Merge pull request #25303 from ankush/fix_bom_test 
test: ignore floating point errors in test_bom
 2021-04-12 20:34:10 +05:30
Ankush Menat
c65751d97f
test: ignore floating point errors in test_bom 2021-04-12 19:45:34 +05:30
Saqib
a19c98255f
fix: patch condition (#25301) 2021-04-12 19:02:28 +05:30
Saqib
9320316462
feat(india): bulk e-invoice generation (#24969) 2021-04-12 17:55:46 +05:30
rohitwaghchaure
5e8ec48e7f
Merge pull request #25294 from rohitwaghchaure/changed-scheduler-check-time 
fix: update scheduler check time
 2021-04-12 16:12:13 +05:30
Rohit Waghchaure
2339de7333 fix: update scheduler check tim 2021-04-12 16:09:55 +05:30
Saqib
49336b8065
fix: consolidated sales invoice posting date (#25119) 2021-04-12 12:17:50 +05:30
Prssanna Desai
1fd1e0d4e9
Merge pull request #25287 from prssanna/invoice-timesheet-fix 
fix: declare data before assigning
 2021-04-12 12:07:29 +05:30
prssanna
42f4a00c88 fix: declare data before assigining 2021-04-12 12:01:20 +05:30
Marica
be26e59087
Merge pull request #25196 from noahjacob/UX 
fix: Company field in Warehouse
 2021-04-12 11:08:45 +05:30
Deepesh Garg
5f3d7f547c
fix: Item wise tax rate for consolidated POS invoice (#25029) 
* fix: Item wise tax rate for consolidated POS invoice

* fix: Do not alter item wise taxes for consolidated invoices

* fix: Add test case

* fix: Update

* fix: Set opening stock for test item

* fix: Add valuation rate for opening stock
 2021-04-12 10:56:47 +05:30
Deepesh Garg
c36e48a869
fix: GST on freight charge in e-invoicing (#25000) 
* fix: GST on freight charge in e-invocing

* fix: Add patch for taxable value field

* fix: Handle discounts on net total

* fix: Handle all types of discounts for e-invoicing

* fix: Absolute taxable values

* fix: Use correct tax amount
 2021-04-12 10:55:43 +05:30
Marica
99522252c4
Merge branch 'develop' into UX 2021-04-12 10:51:24 +05:30
Anupam Kumar
9f73bd8040
fix: don't delete mode of payment account details while deleting company transactions (#25217) 2021-04-12 10:31:36 +05:30
Saqib
b8a270074e
fix(pos): cannot set qty to less than zero (#25258) 2021-04-12 10:28:05 +05:30
Anoop
207166fe8b
fix(patch): copy Lab Test / Template renamed field values (#25276) 
reload_doc doctypes introduced since v11
 2021-04-12 10:25:34 +05:30
Ankush Menat
d235fc75ad
fix: remove nonexistent method from pick list (#25279) 
This method is merged in calculate_rate_and_amount() during repost item
valuation refactoring.

Ref:
e10f0a5a6c (diff-a160e3a8907dcdf28ce7728bb7dd45914ad8ab033489ea3de4c80fb1c4ca7fe9)
 2021-04-12 10:23:06 +05:30
Deepesh Garg
4d4d7074d0
Merge pull request #25053 from deepeshgarg007/delivery_note_gst_category 
fix: Add GST category field in Delivery Note
 2021-04-10 22:12:42 +05:30
Deepesh Garg
1466e2d758
Merge pull request #25271 from deepeshgarg007/loan_penalty_new_fix 
fix: Consider paid repayment entries in subsequent loan repayments
 2021-04-10 21:00:46 +05:30
Deepesh Garg
81ecd0b8b6 Merge branch 'develop' of https://github.com/frappe/erpnext into delivery_note_gst_category 2021-04-10 20:54:38 +05:30
Deepesh Garg
b58590251b fix: minor improvements and tests 2021-04-10 19:55:36 +05:30
rohitwaghchaure
5899477cbb
Merge pull request #25015 from rohitwaghchaure/fixed-patch-item-reposting-for-incorrect-sl-and-gl-develop 
fix: patch
 2021-04-10 18:58:44 +05:30
Deepesh Garg
f38a653a08 fix: Show exact error message in datetime 2021-04-10 18:34:51 +05:30
Deepesh Garg
e7efbc1d33 Merge branch 'develop' of https://github.com/frappe/erpnext into loan_penalty_new_fix 2021-04-10 18:33:38 +05:30
Deepesh Garg
37d6c19a34 fix: Consider paid repayment entries in subsequent loan repayments 2021-04-10 18:33:26 +05:30
Deepesh Garg
8a01dbe8e1
Merge pull request #25261 from ankush/issue_status_banner_fix 
fix: condition for SLA status banner
 2021-04-10 17:56:51 +05:30
Rohit Waghchaure
1db8c51749 fix: changed logic 2021-04-10 10:45:29 +05:30
Rohit Waghchaure
b9aa775f3b fix: pricing_rule test cases 2021-04-10 10:45:28 +05:30
Rohit Waghchaure
1358443cdb fix: patch 2021-04-10 10:42:08 +05:30
Deepesh Garg
c85c243f9c
Merge pull request #25255 from nextchamp-saqib/issue-condition-fix 
fix: condition for setting agreement status
 2021-04-09 21:40:14 +05:30
Deepesh Garg
df9388aa8e
Merge pull request #25086 from deepeshgarg007/advance_amount_precision 
fix: Precision issues while allocating advance amount
 2021-04-09 21:39:02 +05:30
noahjacob
110f28f869 Company field editable and is readonly after saving. 2021-04-09 20:01:47 +05:30
Saqib
14b98c1737
Merge branch 'develop' into issue-condition-fix 2021-04-09 18:29:01 +05:30
Anupam Kumar
986452107b
fix: Lead Source's module (#24583) 
* fix: Lead Source's module

* fix: patch fix
 2021-04-09 18:15:51 +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
Rohit Waghchaure
ca5e10892c fix: travis 2021-04-09 16:23:45 +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
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