schuetz3/schuetz3-erpnext
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
43,721 Commits 322 Branches 1,581 Tags
0dbac5b6897b8a680b97aa8be256d2ed466d79e8
Commit Graph

2123 Commits

Author SHA1 Message Date
barredterra
ba51d50fef fix: translation for warning on Overbilling/-receipt/-delivery 
(cherry picked from commit 36997d9788)
 2022-12-14 17:55:04 +00:00
Deepesh Garg
c726c16702 fix: Reapply pricing rule on qty change 
(cherry picked from commit b741ae143c)
 2022-12-08 13:12:30 +00:00
barredterra
ef933a8231 fix: add translation variable order 
(cherry picked from commit 748c74ba52)
 2022-12-08 09:47:56 +00:00
Deepesh Garg
030765618b fix: Allow item rate udpates for non-stock invoices 
(cherry picked from commit ef9d126254)
 2022-12-06 03:43:16 +00:00
Deepesh Garg
9b40b7f240 fix: Due date for month end payment term 
(cherry picked from commit bfb81ef56f)
 2022-12-01 12:46:55 +00:00
Deepesh Garg
5abcb478d0 chore: Update condition 
(cherry picked from commit 6a47fb6c9e)
 2022-11-29 03:59:09 +00:00
Deepesh Garg
2aada1a0d9 fix: Auto repeat date validations 
(cherry picked from commit fa15221455)
 2022-11-29 03:59:09 +00:00
Deepesh Garg
ef687e22b8 fix: Dispatch address display 
(cherry picked from commit 104fdcb9f9)
 2022-11-24 12:31:13 +00:00
ruthra kumar
14235f24b2 fix: update advace paid in SO/PO in account currency 
(cherry picked from commit bf76b85dfd)
 2022-11-22 08:15:56 +00:00
s-aga-r
4de02dc258 fix: don't set rejected-qty in return SCR 
(cherry picked from commit 8a73e963ce)
 2022-11-18 09:31:11 +00:00
s-aga-r
7fd6c43752 Revert "fix: get consumed_qty based on received_qty in SCR" 
This reverts commit 70c9b8dc50.

(cherry picked from commit 01f56c621c)
 2022-11-15 09:48:02 +00:00
Daizy Modi
34ca17ab11 perf: use get_cached_value instead of db.get_value in controllers (#32776) 
(cherry picked from commit 4efc947f14)
 2022-11-07 03:52:39 +00:00
Sagar Sharma
ea9a50278d fix: get consumed_qty based on received_qty in SCR 
(cherry picked from commit 70c9b8dc50)
 2022-11-06 10:48:34 +00:00
Deepesh Garg
b9fb1045d7 feat: Item Wise TDS Calculation 2022-11-06 11:50:20 +05:30
Deepesh Garg
6838e5ea3b fix: Disable tax included prices for internal transfers (#32794) 
* fix: Disable tax-included prices for internal transfers

(cherry picked from commit 8d30ebb12b)
 2022-11-05 15:22:07 +00:00
Sagar Sharma
0856e65700 test: fix test case 
(cherry picked from commit 324bfa9fde)
 2022-11-05 11:53:50 +00:00
Sagar Sharma
3f79a057e4 fix: make BOM required in SCR Item 
(cherry picked from commit 760c26e9c0)
 2022-11-05 11:53:50 +00:00
Sagar Sharma
e629cba2b7 fix: map BOM while mapping the return SCR 
(cherry picked from commit 54072ec9cd)
 2022-11-05 11:53:49 +00:00
Deepesh Garg
b7763d953a fix: Auto advance allocation against partial invoices 
(cherry picked from commit 181df2fe63)
 2022-11-05 10:58:42 +00:00
Rohit Waghchaure
6989cdf4f2 fix: not able to select customer / supplier 
(cherry picked from commit b0fc568c80)
 2022-11-03 06:25:53 +00:00
ruthra kumar
a561432908 fix: update advance paid in SO/PO from Payment Ledger 
(cherry picked from commit 4487065b67)
 2022-11-02 10:59:45 +00:00
Deepesh Garg
a260426dd4 fix: Mode of payment for returns in POS Sales Invoice 
(cherry picked from commit 06e8e28531)
 2022-11-01 16:00:18 +00:00
Rohit Waghchaure
f50b485225 test: added test case to validate seachfields for customer, supplier 
(cherry picked from commit 5f84993bae)
 2022-10-24 11:42:16 +00:00
Rohit Waghchaure
fb1c30718b fix: searchfield not working for cuctsomer, supplier as per customize form 
(cherry picked from commit 46d148defd)
 2022-10-24 11:42:15 +00:00
Deepesh Garg
2494ccc0a2 chore: check only for inter-company transfers 
(cherry picked from commit 9aa5e20ef7)
 2022-10-12 10:54:33 +00:00
Deepesh Garg
108720b9c3 chore: fix precision condition 
(cherry picked from commit 49601558c6)
 2022-10-12 10:54:33 +00:00
Deepesh Garg
4f3e209009 chore: Use proper accounts 
(cherry picked from commit 1c05c004cd)
 2022-10-12 10:54:33 +00:00
Deepesh Garg
b386b8c634 chore: GL Entries for SLE diff 
(cherry picked from commit df2a0e265b)
 2022-10-12 10:54:32 +00:00
Deepesh Garg
8eda2dbdf8 fix: Hanlde rounding loss for internal transfer 
(cherry picked from commit 6e47fd54a0)
 2022-10-12 10:54:32 +00:00
Deepesh Garg
b653f43b70 fix: Incoming rate precision fixes for intra company transfer 
(cherry picked from commit 083309c056)
 2022-10-12 10:54:31 +00:00
Sagar Sharma
793fa18225 fix: add validation for non-stock item in SCR 
(cherry picked from commit fa2290657a)
 2022-09-30 11:23:50 +00:00
Rohit Waghchaure
f167abbbfd fix: searchfields as per customize form not working for Item 
(cherry picked from commit fd889fd29a)
 2022-09-29 09:22:44 +00:00
Anand Baburajan
f4648ed610 Merge branch 'version-14-hotfix' into mergify/bp/version-14-hotfix/pr-32226 2022-09-28 22:24:03 +05:30
Sagar Sharma
d91ac5e549 fix: supplied items added twice in Stock Entry 
(cherry picked from commit ac7409bbf3)
 2022-09-28 12:20:55 +00:00
anandbaburajan
f5f13c4611 fix: calculate depreciation properly on asset sale entry and scrap entry 
(cherry picked from commit ff5cad1cd6)

# Conflicts:
#	erpnext/assets/doctype/asset/depreciation.py
 2022-09-28 08:59:41 +00:00
ruthra kumar
7554ac9569 fix: get amount in words for debit note 
(cherry picked from commit 70f6484d9d)
 2022-09-20 12:44:03 +00:00
Sagar Sharma
ff210c73eb fix: po_detail or sco_rm_detail not getting set while while mapping SE 
(cherry picked from commit 3a9c08e7c9)
 2022-09-19 13:49:43 +00:00
Rohit Waghchaure
436b7e3b70 fix: suggestion threshold label and rule was not working for other items with min and max amount 
(cherry picked from commit f5bd3fa952)
 2022-09-17 06:42:22 +00:00
Rohit Waghchaure
f370c7b50b fix: consider posting time for internal transfer PO 
(cherry picked from commit cb763938dc)
 2022-09-16 04:08:04 +00:00
Nabin Hait
cd613c6033 fix: merge conflict 2022-09-13 16:20:42 +05:30
Deepesh Garg
9fd8fffb28 Merge pull request #32166 from frappe/mergify/bp/version-14-hotfix/pr-32144 
fix: Rate for internal PI have non stock UOM items (backport #32144)
 2022-09-13 14:40:31 +05:30
Deepesh Garg
dda057d257 chore: Resolve conflicts 2022-09-13 13:40:36 +05:30
mergify[bot]
944b8a0ed7 fix: remove EmployeeBoardingController (backport #32139) (#32191) 
Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
Co-authored-by: Raffael Meyer <14891507+barredterra@users.noreply.github.com>
 2022-09-13 09:50:36 +05:30
Deepesh Garg
c06e241fbc fix: Rate for internal PI have non stock UOM items 
(cherry picked from commit 0f655e4430)

# Conflicts:
#	erpnext/controllers/buying_controller.py
 2022-09-12 03:40:43 +00:00
ruthra kumar
ccd0449006 fix: delete linked payment ledger entries no source doc deletion 
(cherry picked from commit 70313df531)
 2022-09-11 06:37:22 +00:00
Sagar Sharma
4568648d8c fix: SCO Supplied Items returned-qty 
(cherry picked from commit ccb2889cac)
 2022-09-08 13:31:38 +00:00
Sagar Sharma
f2ab220ce3 fix: Subcontracting Receipt GL Entries (backport #31918) (#32124) 
fix: Subcontracting Receipt GL Entries
 2022-09-08 11:18:00 +05:30
Rohit Waghchaure
4bac0daf9b fix: internal transfer flow 2022-09-07 14:29:15 +05:30
Sagar Sharma
09d8fa4b5d fix: AD not getting copied from SCO while creating a Material Transfer (#32109) 
fix: AD not getting copied from SCO while creating a Material Transfer (#32106)
 2022-09-07 12:42:12 +05:30
Rohit Waghchaure
6ab0637b0b test: test cases for PI and DN 2022-09-06 11:54:56 +05:30