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

33462 Commits

Author SHA1 Message Date
Deepesh Garg
ae54610b2a
Merge pull request #32659 from deepeshgarg007/inter_company_purchase_doc_address 
fix: Billing Address for inter-company purchase docs
 2022-10-20 11:58:53 +05:30
rohitwaghchaure
873502c95d
Merge pull request #32654 from rohitwaghchaure/fixed-conversion-issue-in-material-request 
fix: incorrect qty in material request created from PP
 2022-10-20 09:59:19 +05:30
Deepesh Garg
796f2d3c09 fix: Billing Address for inter-company purchase docs 2022-10-19 23:50:39 +05:30
FinByz Tech Pvt. Ltd
c52b41d311
feat(report): added account wise redirection 
* feat(report):added account wise redirection

Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
 2022-10-19 23:14:10 +05:30
Raffael Meyer
4ad3002861
fix: allow to create Sales Order from expired Quotation (#32641) 2022-10-19 22:07:02 +05:30
ruthra kumar
6e55b419a6 test: invoice outstandings and payments 2022-10-19 21:49:13 +05:30
ruthra kumar
8f60f0a0cf feat: Basic Payment Ledger report 2022-10-19 21:49:08 +05:30
Rohit Waghchaure
4d5ef721f7 test: validate qty and purchase uom in material request which is created from PP 2022-10-19 19:08:27 +05:30
Rohit Waghchaure
ad278b2007 fix: incorrect qty in material request 2022-10-19 18:38:34 +05:30
rohitwaghchaure
de4c0528f9
Merge pull request #32645 from rohitwaghchaure/fixed-capacity-planning-error 
fix: overlap error not raised for job card in case of workstation with production capacity
 2022-10-19 17:04:48 +05:30
barredterra
23f0bb45b0 fix: unset contact details 2022-10-19 12:26:56 +02:00
Deepesh Garg
430492152f
fix: Advance paid amount in orders (#32642) 2022-10-19 15:37:13 +05:30
Rohit Waghchaure
8b2165e0d1 fix: overlap error not raised for job card in case of workstation with production capacity 2022-10-19 14:19:50 +05:30
ruthra kumar
f844097f8e
Merge pull request #32635 from ruthra-kumar/fix_tax_or_charges_acc_updating_voucher_outstanding 
fix: Integrity Error on PLE while submitting sales invoice
 2022-10-19 09:43:24 +05:30
Maharshi Patel
96b4211ea1
fix: pricing rule for non stock UOM and conversions 
* fix: pricing rule for non stock UOM and conversions
 2022-10-18 22:26:11 +05:30
ruthra kumar
8f42e7f703 test: use payable account in tax and to trigger party validation 2022-10-18 17:27:46 +05:30
Sagar Sharma
ae8a63827d
Merge branch 'develop' into refactor/stock/reports 2022-10-18 10:48:52 +05:30
Deepesh Garg
7184330acd
Merge pull request #32527 from s-aga-r/refactor/buying/reports 
refactor: rewrite buying reports queries in qb
 2022-10-18 10:06:10 +05:30
ruthra kumar
43b80683eb fix: party type and party mandatory on updating outstanding 2022-10-18 09:33:37 +05:30
Deepesh Garg
32117c030a
Merge pull request #32622 from deepeshgarg007/ignore_pi_reference 
fix: Ignore linked purchase invoice on cancel
 2022-10-17 19:38:26 +05:30
Dany Robert
9df9915600 fix: query condition change 2022-10-17 15:54:46 +02:00
Deepesh Garg
faadf78332 fix: Ignore linked purchase invoice on cancel 2022-10-17 18:50:54 +05:30
ruthra kumar
9b50221bf0 refactor: split ple creation function into two 
refactor create_payment_ledger_entry function into 2.
one for generating ple map and one for DB entry creation
 2022-10-17 18:02:52 +05:30
Dany Robert
2665d7d293 feat: page break in SoA pdf 2022-10-17 14:29:03 +02:00
Deepesh Garg
98b695984b
Merge branch 'develop' into refactor/buying/reports 2022-10-17 17:15:27 +05:30
Deepesh Garg
8b16ba7f3a
Merge branch 'develop' into refactor/stock/reports 2022-10-17 17:15:18 +05:30
Deepesh Garg
d794b834fd
Merge pull request #32618 from ruthra-kumar/fix_failing_github_unit_test_workflow 
test: lead creation and deletion restricted to dummy company
 2022-10-17 17:11:51 +05:30
Sagar Sharma
582e1bf10c Merge branch 'develop' into refactor/stock/reports 2022-10-17 16:30:43 +05:30
ruthra kumar
ced8d2a537 test: lead creation and deletion restricted to dummy company 2022-10-17 16:26:07 +05:30
Sagar Sharma
cda0baa7fe
Merge branch 'develop' into refactor/buying/reports 2022-10-17 16:10:52 +05:30
rohitwaghchaure
0f358e3ca1
Merge pull request #32613 from rohitwaghchaure/group-warehouse-filter 
fix: group warehouse filter not working for Batch-wise Balance history report
 2022-10-17 15:12:42 +05:30
Rohit Waghchaure
2481574a28 chore: seperate function to apply filter for warehouse in case of QB 2022-10-17 14:25:23 +05:30
Rohit Waghchaure
6381e75fa5 fix: group warehouse filter not working for Batchwise Balance history report 2022-10-17 12:17:05 +05:30
Sagar Sharma
484b115b09
Merge branch 'develop' into refactor/stock/reports 2022-10-17 12:08:44 +05:30
Sagar Sharma
309fc6db43
Merge branch 'develop' into refactor/buying/reports 2022-10-17 12:08:37 +05:30
Deepesh Garg
dc3fe85921
chore: Remove HRMS related code (#32607) 
Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
 2022-10-17 11:37:50 +05:30
Sagar Sharma
682fb171cb
Merge branch 'develop' into refactor/buying/reports 2022-10-16 11:50:31 +05:30
Sagar Sharma
177c9c93e8
Merge branch 'develop' into refactor/stock/reports 2022-10-16 11:50:26 +05:30
Deepesh Garg
40b3d8ec1b
Merge pull request #32591 from nabinhait/crm-notes-to-comments 
fix: Renamed Notes section to Comments
 2022-10-15 17:42:45 +05:30
Deepesh Garg
fc795275f2
Merge pull request #32594 from deepeshgarg007/order_account 
fix: Party account for multi-order invoices
 2022-10-15 16:58:51 +05:30
Sagar Sharma
5f3796f6ea
Merge branch 'develop' into refactor/buying/reports 2022-10-14 11:57:11 +05:30
Sagar Sharma
3c1bd90d0d
Merge branch 'develop' into refactor/stock/reports 2022-10-14 11:57:04 +05:30
Anand Baburajan
9127b96033
fix: add project settings to projects workspace (#32568) 2022-10-13 18:27:11 +05:30
Ankush Menat
50e9698932
chore: drop dead code (#32595) 
[skip ci]
 2022-10-13 15:25:22 +05:30
Deepesh Garg
fd49503ba2 fix: Party account for multi-order invoices 2022-10-13 15:08:34 +05:30
ruthra kumar
2d0217abd5
Merge pull request #32567 from ruthra-kumar/remove_duplicate_ple_on_item_value_repost 
fix: deduplicate Payment Ledger on Item value repost
 2022-10-13 14:01:59 +05:30
Nabin Hait
f561d8f689 fix: Renamed Dashboard tab label to Connections 2022-10-13 12:43:08 +05:30
Nabin Hait
56a4a77398 fix: Renamed Notes section to Comments 2022-10-13 12:35:04 +05:30
Raffael Meyer
e543dca6a0
fix: don't try to update youtube data if disabled in settings (#32588) 
fix: cast value from db

[skip ci]
 2022-10-13 11:53:52 +05:30
Sagar Sharma
bb7897caab
Merge branch 'develop' into refactor/stock/reports 2022-10-12 19:21:15 +05:30
Sagar Sharma
610d18cc25
Merge branch 'develop' into refactor/buying/reports 2022-10-12 19:21:10 +05:30
Sagar Sharma
7dfd741ced
Merge branch 'develop' into fix/github-issue/32559 2022-10-12 19:20:39 +05:30
Rohit Waghchaure
692462d7c8 fix: removed unnecessary imports 2022-10-12 16:30:48 +05:30
Deepesh Garg
43c2bd1351
Merge pull request #32272 from deepeshgarg007/internal_transfer_precision_fixes 
fix: Incoming rate precision fixes for intra company transfer
 2022-10-12 16:23:16 +05:30
ruthra kumar
eb819368aa test: dedeplication on payment ledger upon repost 2022-10-12 16:08:59 +05:30
Deepesh Garg
9aa5e20ef7 chore: check only for inter-company transfers 2022-10-12 15:53:28 +05:30
Rohit Waghchaure
98bf8e1304 fix: test case 2022-10-12 15:45:36 +05:30
Rohit Waghchaure
3266e54e33 fix: consider outgoingrate while valuation rate calculate 2022-10-12 15:44:53 +05:30
Rohit Waghchaure
683a47f7a1 fix: consider sales rate as incoming rate for transit warehouse in purchase flow 2022-10-12 15:44:53 +05:30
ruthra kumar
65992304bc fix: delete old ple's on item value repost 2022-10-12 15:34:50 +05:30
Deepesh Garg
49601558c6 chore: fix precision condition 2022-10-12 14:57:16 +05:30
Deepesh Garg
1c05c004cd chore: Use proper accounts 2022-10-12 14:19:09 +05:30
Deepesh Garg
c8d2181498 chore: Increase precision for other doc fields 2022-10-12 14:17:55 +05:30
Sagar Sharma
59edf64951
Merge branch 'develop' into refactor/stock/reports 2022-10-12 13:30:00 +05:30
Sagar Sharma
0af385d73f
Merge branch 'develop' into refactor/buying/reports 2022-10-12 13:29:50 +05:30
Sagar Sharma
d2755c0106
Merge branch 'develop' into fix/github-issue/32559 2022-10-12 13:28:35 +05:30
Rohan
43037d893d
fix: type-cast while saving an item (#32549) 2022-10-12 13:07:58 +05:30
Sagar Sharma
7da32c7db3 fix: Brand Defaults filters 2022-10-12 12:15:07 +05:30
Sagar Sharma
16aef53470
Merge branch 'develop' into refactor/stock/reports 2022-10-12 00:38:40 +05:30
Sagar Sharma
a161048a9d
Merge branch 'develop' into refactor/buying/reports 2022-10-12 00:38:37 +05:30
Deepesh Garg
38b34f2a45
Merge pull request #32408 from nabinhait/sales-purchase-tab-break 
feat: Tab Breaks in all Sales and Purchase cycle transactions
 2022-10-11 16:02:45 +05:30
Deepesh Garg
df2a0e265b chore: GL Entries for SLE diff 2022-10-11 14:55:09 +05:30
Deepesh Garg
dc20b21fb5 test: Internal tranfer precision loss test 2022-10-11 14:54:27 +05:30
Deepesh Garg
b31c3bd35d chore: Increase incoming_rate field precision to 6 2022-10-11 14:53:26 +05:30
ruthra kumar
633c2a289e
Merge pull request #32557 from ruthra-kumar/value_error_on_pos_save 
fix: Value error on validation of POS invoices with Serial Nos
 2022-10-11 14:42:47 +05:30
Nabin Hait
e71c417f7e fix: minor cleanup 2022-10-11 13:21:27 +05:30
Nabin Hait
5389a35798 fix: more fields reordering related to Tab Break 2022-10-11 13:21:07 +05:30
Nabin Hait
aaf3c2b329 feat: Tab Break in Purchase Invoice 2022-10-11 13:20:41 +05:30
Nabin Hait
35f836c4b7 feat: Tab Break in Purchase Receipt 2022-10-11 13:18:21 +05:30
Nabin Hait
3d9263bf86 feat: Tab Break in Supplier Quotation 2022-10-11 13:18:21 +05:30
Nabin Hait
2172c5034a feat: Tab Break in Material Request 2022-10-11 13:18:21 +05:30
Nabin Hait
10a25603ac feat: Tab Break in Purchase Order 2022-10-11 13:18:21 +05:30
Nabin Hait
7546562139 feat: Tab Break in Quotation 2022-10-11 13:18:21 +05:30
Nabin Hait
f6613e1e4c feat: Tab Break in Sales Order, Delivery Note, Sales Invoice and Purchase Order 2022-10-11 13:18:21 +05:30
ruthra kumar
9e2bd10d03 test: value error on serial no validation on pos 2022-10-11 12:54:50 +05:30
Deepesh Garg
dddbc130db Merge branch 'develop' of https://github.com/frappe/erpnext into internal_transfer_precision_fixes 2022-10-11 12:54:11 +05:30
ruthra kumar
4b908ebcd6 fix: value error on pos submit 2022-10-11 11:21:11 +05:30
Deepesh Garg
b99b2b75ca
Merge pull request #32477 from rasos/patch-1 
Austria chart of accounts update
 2022-10-11 10:20:49 +05:30
Anand Baburajan
ba754825b9
Merge branch 'develop' into fix_budget_autoname 2022-10-10 23:17:18 +05:30
anandbaburajan
e4d7d8c42d fix: use naming_series in budget 2022-10-10 23:04:34 +05:30
codezart
2d30b36cca fix: number of months subscription plan 2022-10-10 11:24:42 -04:00
ruthra kumar
65194efa97
Merge pull request #32548 from ruthra-kumar/suppress_linked_doc_valdiation_on_delete 
fix: allow deletion of cancelled Invoices once payments are unlinked
 2022-10-10 16:41:07 +05:30
ruthra kumar
143f905838 test: update ple on payment unlink for SI's and SO's 2022-10-10 15:57:38 +05:30
Deepesh Garg
a14c5dbcc4 Merge branch 'develop' of https://github.com/frappe/erpnext into internal_transfer_precision_fixes 2022-10-10 15:08:15 +05:30
rohitwaghchaure
be1ebd348b
Merge pull request #32497 from s-aga-r/fix/quality-inspection/status 
chore: set `Quality Inspection` status based on readings status
 2022-10-10 10:49:56 +05:30
ruthra kumar
537d953f4c fix: unlink payment on invoice cancellation 2022-10-10 10:17:19 +05:30
Deepesh Garg
d806e32030 fix: PO cancel post advance payment cancel against PO 2022-10-08 21:25:11 +05:30
Deepesh Garg
4b828dd276 Merge branch 'develop' of https://github.com/frappe/erpnext into loan_schedule_types 2022-10-08 18:41:39 +05:30
Sagar Sharma
60befcd8a8
Merge branch 'develop' into fix/quality-inspection/status 2022-10-08 13:34:21 +05:30
Sagar Sharma
4992e4a2b8 fix(test): test_rejected_qi_validation 2022-10-08 13:33:36 +05:30