Deepesh Garg
902e1ab74b
Merge branch 'develop' into patch-9
2022-11-10 20:08:27 +05:30
Deepesh Garg
f4920d6475
Merge pull request #32880 from ernestoruiz89/patch-7
...
fix: add translate function to valitate company msg in chart of accounts importer
2022-11-10 20:07:52 +05:30
Deepesh Garg
06a42caa5b
Merge pull request #32923 from deepeshgarg007/rate_quotation
...
fix: Maintain same rate between Quotation and Sales Order
2022-11-10 19:52:27 +05:30
Deepesh Garg
e559fea8ff
Merge pull request #32921 from deepeshgarg007/netvalues_psoa
...
feat: Add net value filter on PSOA
2022-11-10 19:51:56 +05:30
Deepesh Garg
8f65677cb4
Merge pull request #32912 from nabinhait/customer-supplier-tab-break
...
fix(ux): Tab break in Customer and Supplier form
2022-11-10 18:30:14 +05:30
Deepesh Garg
362ec7b673
fix: Maintain same rate between Quotation and Sales Order
2022-11-10 18:28:08 +05:30
Deepesh Garg
51521fc19f
feat: Add net value filter on PSOA
2022-11-10 17:48:25 +05:30
Sagar Sharma
e7fa2e08ad
fix: set WIP Warehouse in Job Card
2022-11-10 16:40:53 +05:30
Sagar Sharma
9730cd0aec
fix: don't set WIP Warehouse if is checked in WO
2022-11-10 16:18:10 +05:30
Ernesto Ruiz
a007f1da9d
Merge branch 'develop' into patch-7
2022-11-09 15:53:36 -06:00
Ernesto Ruiz
499dfee2d4
Merge branch 'develop' into patch-9
2022-11-09 15:52:35 -06:00
Ankush Menat
7e1742956c
refactor: Remove usage of deprecated methods ( #32914 )
...
Warn: Just used regex to replace all usage.
```regex
s/frappe.db.set(\(.*\),\(.*\),\(.*\))/\1.db_set(\2, \3)/g
```
Required after: https://github.com/frappe/frappe/pull/18815
2022-11-09 20:09:06 +05:30
Nabin Hait
fb7ee301b5
fix(ux): Tab break in Customer and Supplier form
2022-11-09 18:03:23 +05:30
Deepesh Garg
ff51f3b95e
Merge branch 'develop' into patch-7
2022-11-09 14:34:39 +05:30
Deepesh Garg
5f1b226362
Merge pull request #32742 from ruthra-kumar/ple_repost
...
feat: Tool to repost PLE manually
2022-11-09 14:26:37 +05:30
Deepesh Garg
077f3c515f
Merge branch 'develop' into patch-9
2022-11-09 09:19:28 +05:30
Sagar Sharma
030ef6da25
Merge branch 'develop' into fix/scr/return-scr-ref
2022-11-08 21:36:00 +05:30
Deepesh Garg
c8619284bc
Merge pull request #32883 from deepeshgarg007/timesheet_project_filter
...
fix: Project filter in timesheet
2022-11-08 14:54:49 +05:30
Sagar Sharma
47248251e2
chore: link SCR Return in SCR Dashboard
2022-11-08 12:29:41 +05:30
Sagar Sharma
84ab100d86
chore: remove debugger from stock_entry_list.js
2022-11-08 12:05:15 +05:30
Deepesh Garg
55d6773be6
Merge branch 'develop' of https://github.com/frappe/erpnext into timesheet_project_filter
2022-11-08 11:02:01 +05:30
Deepesh Garg
7b5cf6978e
chore: Linting Issues
2022-11-08 11:00:48 +05:30
ruthra kumar
0448c0fa36
feat: Repost Payment Ledger entries for vouchers
...
primarily intended to manually correct PLE entries for vouchers
affected by Item Value repost-https://github.com/frappe/erpnext/pull/32567
2022-11-08 07:47:47 +05:30
Deepesh Garg
2b65b22aa2
fix: Project filter in timesheet
2022-11-07 22:48:52 +05:30
Sagar Sharma
1d52084b05
Merge branch 'develop' into fix/ux/scr/supplied-items/consumed-qty
2022-11-07 21:58:11 +05:30
Sagar Sharma
5e8a22be24
fix: linter
2022-11-07 21:54:12 +05:30
Ernesto Ruiz
1f13bc906b
fix: add translation functuinon to doctype name on message in bulk_transaction_processing
2022-11-07 09:43:28 -06:00
Ernesto Ruiz
637c08d189
fix: add translate function to valitate company msg in chart of accounts importer
2022-11-07 09:22:38 -06:00
Deepesh Garg
404662e794
Merge pull request #32625 from deepeshgarg007/editable_inovice
...
feat: Editable Sales Invoice
2022-11-07 18:29:21 +05:30
Sagar Sharma
734db5b722
Merge branch 'develop' into fix/ux/scr/supplied-items/consumed-qty
2022-11-07 17:36:42 +05:30
Sagar Sharma
bf4b012cec
fix: make consumed_qty editable when backflush based on Material Transfer
2022-11-07 17:23:33 +05:30
Sagar Sharma
f8d2e276a5
fix: make consumed_qty read-only in SCR Supplied Items
2022-11-07 17:19:03 +05:30
Deepesh Garg
e29f756146
chore: Validate for deferred revenue invoices
2022-11-07 16:42:45 +05:30
Deepesh Garg
5fe55176ec
chore: Enable no-copy for repost required field
2022-11-07 16:42:12 +05:30
Ankush Menat
30daeb90a8
fix: incorrect single valeu fetch
...
refer https://github.com/frappe/frappe/pull/18787
[skip ci]
2022-11-07 15:38:38 +05:30
Nihantra C. Patel
8355c1092c
fix: Increase columns width in Warehouse wise Item Balance Age and Value
2022-11-07 11:45:47 +05:30
rohitwaghchaure
5e7a69e649
Merge pull request #32802 from s-aga-r/fix/github-issue/29006
...
fix: `Material Consumption` option in case of `Skip Transfer to WIP` in WO
2022-11-07 09:35:39 +05:30
Daizy Modi
4efc947f14
perf: use get_cached_value instead of db.get_value in controllers ( #32776 )
2022-11-07 09:21:03 +05:30
Sagar Sharma
4d8da4420e
test: add test case for consumed-qty
2022-11-06 14:55:33 +05:30
Sagar Sharma
70c9b8dc50
fix: get consumed_qty based on received_qty in SCR
2022-11-06 13:33:47 +05:30
Sagar Sharma
c447dfaa9c
fix: set received_qty before_validate SCR
2022-11-06 13:32:15 +05:30
ruthra kumar
9209ec59c2
refactor: split delete gl utility function into two
2022-11-06 11:39:44 +05:30
Raffael Meyer
d2b6490bca
chore: add german translations ( #32846 )
...
Mostly for balance sheet
2022-11-06 10:22:33 +05:30
Deepesh Garg
8d30ebb12b
fix: Disable tax included prices for internal transfers ( #32794 )
...
* fix: Disable tax-included prices for internal transfers
2022-11-05 20:51:15 +05:30
Sagar Sharma
0394080898
Merge branch 'develop' into fix/github-issue/29006
2022-11-05 20:11:55 +05:30
Ankush Menat
75983ce809
fix: remove global _("translation") calls ( #32828 )
...
This is not how it works. Translations are dynamic based on language
sets during request (using header, user's preferences etc)
Calling them on global variables makes no sense.
Ref: https://github.com/frappe/frappe/pull/18733
2022-11-05 18:49:15 +05:30
Sagar Sharma
cc8d540943
Merge branch 'develop' into fix/scr/return
2022-11-05 16:48:59 +05:30
Deepesh Garg
90fbab4b1e
Merge pull request #32847 from maharshivpatel/fix-pos-opening-entry-profile-filter
...
fix: Create POS Opening Entry POS Profile filter.
2022-11-05 16:44:39 +05:30
Sagar Sharma
5665d1afa0
Merge branch 'develop' into fix/scr/return
2022-11-05 16:36:07 +05:30
Deepesh Garg
be0f6b3e6e
Merge branch 'develop' of https://github.com/frappe/erpnext into editable_inovice
2022-11-05 16:35:55 +05:30
