Deepesh Garg
6a953d9297
Merge pull request #30806 from deepeshgarg007/accounting_dimension_consistency
...
fix: Consistent accounting dimensions across Sales and Purchase docs
2022-05-01 22:02:41 +05:30
Deepesh Garg
fc09c90af7
Merge branch 'develop' into accounting_dimension_consistency
2022-05-01 22:02:10 +05:30
Deepesh Garg
15237fd747
Merge pull request #30854 from rmehta/fix-discount-accounting-patch
...
fix(minor): discount accounting patch
2022-05-01 15:22:45 +05:30
Rushabh Mehta
d746db5547
fix(minor): discount accounting patch
2022-05-01 12:25:21 +05:30
Deepesh Garg
19d66e5219
Merge branch 'develop' of https://github.com/frappe/erpnext into accounting_dimension_consistency
2022-04-30 22:15:27 +05:30
Deepesh Garg
54d16de849
Merge pull request #30815 from deepeshgarg007/uae_setup_cleaup
...
fix: Ignore custom field validation while setup
2022-04-30 22:03:21 +05:30
Deepesh Garg
bfd053ed23
Merge branch 'develop' into uae_setup_cleaup
2022-04-30 19:54:40 +05:30
Rucha Mahabal
65742947e7
fix(UX): record reason for skipping attendance or marking absent for auto attendance ( #30844 )
2022-04-29 15:46:00 +05:30
Deepesh Garg
dafdc9b68c
Merge pull request #30843 from deepeshgarg007/opening_tool_multi_currency
...
fix: Multi currency opening invoices
2022-04-29 15:16:06 +05:30
Deepesh Garg
a8452c2ba2
fix: Multi currency opening invoices
2022-04-29 14:27:03 +05:30
Deepesh Garg
1622faad40
Merge pull request #30802 from deepeshgarg007/multi_currency_opening
...
fix: Allow multi-currency opening invoices
2022-04-29 13:34:54 +05:30
Deepesh Garg
55b2930b05
Merge pull request #30816 from ruthra-kumar/payment_term_rpt_on_selling
...
refactor: add payment terms status rpt to Selling homepage
2022-04-29 12:33:34 +05:30
Deepesh Garg
0cb36cc18c
Merge branch 'develop' into payment_term_rpt_on_selling
2022-04-28 21:22:38 +05:30
gavin
389c2853eb
docs: Trimmed whitespace from "Try on FCloud" button
...
ERPNext Port of b1effcab4b
2022-04-28 14:57:43 +05:30
Aditya Hase
3c7176d690
fix: Update links to Frappe Cloud ( #30833 )
2022-04-28 11:07:02 +05:30
Ankush Menat
777f0204dd
test: create new item instead of using with _Test Item ( #30827 )
...
Unnecessary dependency causes flake in stock. The test was reposting all
entries for item just to test some behavior that is best tested on a
newly created item _anyway_.
2022-04-27 17:47:40 +05:30
Ankush Menat
0a07cd8f68
chore: "refactor" readme ( #30825 )
...
[skip ci]
2022-04-27 15:47:28 +05:30
Marica
2fffc68938
Merge pull request #30762 from ankush/bunle_pickng
...
feat: support product bundles in picklist
2022-04-27 15:23:16 +05:30
Ankush Menat
ebd5f0b1bb
chore: make picked qty read only
2022-04-27 14:53:20 +05:30
Ankush Menat
9a8e3ef235
fix(UX): only show pick list when picking is pending
...
[skip ci]
2022-04-27 14:43:42 +05:30
Ankush Menat
3ae9fa98c4
ci: failfast when merge conflict exists ( #30823 )
...
[skip ci]
2022-04-27 14:33:26 +05:30
Ankush Menat
47e1a0104c
fix: dont map picked qty and consider pick qty for new PL
...
Co-Authored-By: marination <maricadsouza221197@gmail.com>
2022-04-27 13:44:19 +05:30
Ankush Menat
8207697e43
fix: compare against stock qty while validating
...
Other changes:
- only allow whole number of bundles to get picked
2022-04-27 12:51:18 +05:30
gavin
85e8dd9a49
chore: Add "Try on PWD" button ( #30817 )
2022-04-27 12:41:16 +05:30
Ankush Menat
9e60acdf56
test: test bundle - picklist behaviour
2022-04-27 12:05:15 +05:30
Ankush Menat
ee54ece8fd
test: product bundle fixture
2022-04-27 12:05:15 +05:30
Ankush Menat
1ac275ce61
feat: transfer picklist stock info to packing list
2022-04-27 12:05:15 +05:30
Ankush Menat
41aa4b3524
fix: round off bundle qty
...
This is to accomodate bundles that might allow floating point qty.
2022-04-27 12:05:15 +05:30
Ankush Menat
25485edfd9
refactor: remove unnecssary vars
...
also remove misleading docstring
2022-04-27 12:05:15 +05:30
Ankush Menat
23cb0d684d
feat: create DN from pick list with bundle items
2022-04-27 12:05:15 +05:30
Ankush Menat
f574121741
refactor: simpler check for non-SO items
2022-04-27 12:05:15 +05:30
Ankush Menat
277b51b404
refactor: groupby using keys instead of int index
2022-04-27 12:05:15 +05:30
Ankush Menat
3ddad6891a
refactor: simplify needlessly complicated code
2022-04-27 12:05:15 +05:30
Ankush Menat
60bc26fdbe
feat: back-update min picked qty for a bundle
2022-04-27 12:05:15 +05:30
Ankush Menat
c3fc0a4f55
perf: single update per Sales Order.
...
For each SO item the sales order picking status was being updated, this
isn't required and wasteful.
2022-04-27 12:05:15 +05:30
Ankush Menat
e64cc66df7
refactor: sales order status update
...
- rename badly named variables
- support updated packed items
2022-04-27 12:05:15 +05:30
Ankush Menat
36c5e8a14f
feat: Pick list from SO with Product Bundle
2022-04-27 12:05:15 +05:30
Ankush Menat
7d5682020a
test: bundles in picklist
2022-04-27 12:05:15 +05:30
Ankush Menat
5c3f9019cc
refactor: misc pick list refactors
...
- make tracking fields read only and no-copy 🤦
- collapse print settings section, most users configure it once and
forget about it, not need to show this.
- call pick list grouping function directly
- use get_descendants_of instead of obscure db function
2022-04-27 12:05:15 +05:30
Deepesh Garg
67bb29026f
fix: Ignore custom field validation while setup
2022-04-26 20:15:15 +05:30
Ankush Menat
24a7acaabc
chore: incorrect translations
2022-04-26 19:22:26 +05:30
Ankush Menat
dcc2243fbb
Merge pull request #30811 from marination/multiple-wh-acc
...
chore: Warn users about multiple warehouse accounts
2022-04-26 18:18:11 +05:30
marination
e2a163d4e9
fix: Use account_type == 'Stock' to filter stock accounts
2022-04-26 17:50:51 +05:30
marination
44331f4f1f
chore: Warn users about multiple warehouse accounts
...
- Get distinct accounts that warehouse value has been booked against
- If same account as the one being set, ignore
- If not same account or multiple accounts: warn user that it makes it harder to track mismatches
2022-04-26 17:43:33 +05:30
Rucha Mahabal
1cc8c79807
test: fix flaky carry forwarded leave expiry test ( #30810 )
2022-04-26 17:43:08 +05:30
Saqib Ansari
078f26bef3
Merge pull request #30808 from nextchamp-saqib/pos-search-ux-fix
...
fix(pos): search field doesn't reset on checkout
2022-04-26 14:47:22 +05:30
Saqib Ansari
b1ac5ff9d2
fix(pos): number pad translations
2022-04-26 14:41:36 +05:30
Saqib Ansari
03a6103fe5
fix(pos): search field doesn't reset on checkout
2022-04-26 14:28:33 +05:30
Deepesh Garg
00ace8f62c
Merge branch 'develop' into accounting_dimension_consistency
2022-04-26 14:26:08 +05:30
Deepesh Garg
82a0635c66
fix: Consistent accounting dimensions across Sales and Purchase docs
2022-04-26 14:01:13 +05:30
