ruthra kumar
861387f164
test: difference amount should not be calculated for base currency
2023-03-17 14:14:17 +05:30
ruthra kumar
48fae0c1ce
fix: difference amount calculation for company currency accounts
2023-03-17 14:14:17 +05:30
Sagar Sharma
db1f2d6279
Merge branch 'develop' into FIX-ISS-22-23-05936
2023-03-17 13:54:13 +05:30
s-aga-r
b04a101c11
fix: incorrect Opening Value in Stock Balance report
2023-03-17 13:53:49 +05:30
rohitwaghchaure
1d767d58f2
Merge pull request #34279 from s-aga-r/fix-22-23-05686
...
fix: `Blanket Order`
2023-03-17 10:14:37 +05:30
rohitwaghchaure
558db13040
Merge branch 'develop' into fix-22-23-05686
2023-03-17 08:57:37 +05:30
Anand Baburajan
563ee92043
Merge branch 'develop' into FIX-34354
2023-03-16 18:22:13 +05:30
Anand Baburajan
b6b8392413
fix: refactor asset depr schedule and remove unnecessary depr method ( #34434 )
...
* fix: remove depr method from depr schedule and refactor assetdeprsch
* chore: use assetdeprsch's depr method, not deprschedule's
* fix: use default 0 value for NDB and OAD
* chore: fix rounded numbers
* chore: correct rounding in test_website_item_price_for_logged_in_user
2023-03-16 18:18:47 +05:30
mergify[bot]
bd2dd7dfac
ci: use version specific payments repo (backport #34468 ) ( #34470 )
...
ci: use version specific payments repo (#34468 )
ci: use version-14 branch of payments repo for v14 erpnext
(cherry picked from commit befd1a0f918d8dc35ef071b8d00dd4ae95e167ab)
Co-authored-by: Ritwik Puri <ritwikpuri5678@gmail.com>
2023-03-16 16:20:21 +05:30
Sagar Sharma
357d4994e4
Merge branch 'develop' into fix-22-23-05686
2023-03-14 20:59:38 +05:30
Sagar Sharma
ea269c6a1c
Merge branch 'develop' into FIX-34354
2023-03-14 20:59:27 +05:30
Ankush Menat
f1752fcd7a
Merge pull request #34116 from prateekkaramchandani/develop
...
fix: use max function to get default company address
2023-03-14 19:38:26 +05:30
Ankush Menat
e0042972c8
test: add test for primary address sorting
2023-03-14 18:50:19 +05:30
Sagar Sharma
e9f5ea6ede
Merge pull request #34415 from s-aga-r/FIX-ISS-22-23-05720
...
fix: operation time for multi-level BOM in WO
2023-03-14 18:47:40 +05:30
Ankush Menat
55489d0056
Merge branch 'develop' into prateekkaramchandani/develop
2023-03-14 18:39:06 +05:30
Sagar Sharma
e0b288fbf0
Merge branch 'develop' into FIX-34354
2023-03-14 18:19:38 +05:30
Sagar Sharma
258242f8d7
Merge branch 'develop' into FIX-ISS-22-23-05720
2023-03-14 18:17:48 +05:30
Ankush Menat
f95ad039e4
test: add timeout to all BOM related tests ( #34446 )
...
* Revert "chore: remove failing test (#34444 )"
This reverts commit b89ecd482d
2023-03-14 18:10:17 +05:30
Deepesh Garg
b89ecd482d
chore: remove failing test ( #34444 )
2023-03-14 15:53:03 +05:30
Johannes Obermeier
70c78d0d67
fix: incorrect EAN validation, EAN can be an EAN8, EAN12 or EAN13 code ( #34250 )
...
Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
2023-03-14 15:27:05 +05:30
s-aga-r
22ad9a1903
chore: Allow Zero Valuation Rate msg in SE
2023-03-14 14:33:03 +05:30
marination
d6d0163514
fix: Provision to apply early payment discount if payment is recorded late
...
- Party could have paid on time but payment is recorded late
- Prompt for reference date so that discount is applied while mapping
- Prompt only if discount in payment schedule of valid doctypes
- test: Reference date and impact on PE
- `make_payment_entry` (JS) must be able to access `this`
2023-03-14 14:22:39 +05:30
Sagar Sharma
0dbf4557db
Merge branch 'develop' into FIX-ISS-22-23-05720
2023-03-14 13:19:58 +05:30
Sagar Sharma
185a8910d2
Merge branch 'develop' into fix-22-23-05686
2023-03-14 13:19:46 +05:30
Anand Baburajan
fe672aa9b1
Merge pull request #34392 from AnandBaburajan/patch_assdeprsch_gpa_ndb
...
fix: add missing patch for new fields added in #34214
2023-03-14 12:18:29 +05:30
Sagar Sharma
6c88fb7a8d
Merge branch 'develop' into fix-22-23-05686
2023-03-14 11:44:39 +05:30
Sagar Sharma
48a88b7064
Merge branch 'develop' into FIX-ISS-22-23-05720
2023-03-14 11:44:33 +05:30
Anand Baburajan
72e9c05f46
Merge branch 'develop' into patch_assdeprsch_gpa_ndb
2023-03-13 21:31:57 +05:30
Deepesh Garg
c6999fc687
fix: Total row in trail balance report ( #34395 )
...
* fix: Total row in trail balance report
* fix: Calculate total after preparing opening and closing
2023-03-13 21:18:30 +05:30
Deepesh Garg
91f7b0bbd6
Merge branch 'develop' of https://github.com/frappe/erpnext into opening_entry
2023-03-13 20:52:48 +05:30
Deepesh Garg
76775a3e49
fix: Update patch
2023-03-13 20:51:35 +05:30
Deepesh Garg
492e994c22
Merge branch 'develop' into patch_assdeprsch_gpa_ndb
2023-03-13 19:37:55 +05:30
Deepesh Garg
fa776d2987
fix: Use customer name instead of name(id) in PSOA ( #34412 )
2023-03-13 19:37:09 +05:30
Deepesh Garg
d8e54a21fb
test: Update values in Sales Invoice tests ( #34419 )
2023-03-13 19:34:15 +05:30
Sagar Vora
5c06620f97
fix: set tax category from address before executing get_regional_address_details ( #34372 )
2023-03-13 19:32:50 +05:30
HENRY Florian
d267111e13
chore: fix french translation ( #34381 )
...
chore: update french translation
2023-03-13 19:03:16 +05:30
Ernesto Ruiz
796ad01b87
fix: Add translate function to Delayed Tasks Summary Report ( #34411 )
...
fix: Add translate function to Delayed Tasks Summary Report
2023-03-13 19:02:34 +05:30
Deepesh Garg
c8cc3fc65f
chore: Move source and campaign to additional info section ( #34414 )
2023-03-13 18:37:19 +05:30
Deepesh Garg
4416ddc4af
fix: Linked invoice cancellation issue via timesheet ( #34337 )
2023-03-13 18:36:43 +05:30
Sagar Sharma
4a05f3736f
Merge branch 'develop' into FIX-ISS-22-23-05720
2023-03-13 17:50:09 +05:30
s-aga-r
66f650061d
test: add test cases for Over Order Allowance against Blanket Order
2023-03-13 17:21:07 +05:30
Sagar Sharma
9d49afebde
Merge branch 'develop' into fix-22-23-05686
2023-03-13 17:05:27 +05:30
Marica
e1d28063b0
Merge branch 'develop' into early-payment-loss
2023-03-13 16:23:24 +05:30
Anand Baburajan
b8703b0b9b
Merge branch 'develop' into patch_assdeprsch_gpa_ndb
2023-03-13 15:35:08 +05:30
Ankush Menat
b8a61be080
test: fix hypothesis tests ( #34416 )
2023-03-13 15:16:30 +05:30
Anand Baburajan
097be8bdea
Merge branch 'develop' into patch_assdeprsch_gpa_ndb
2023-03-13 15:08:08 +05:30
Sagar Sharma
f2e9a67f37
Merge branch 'develop' into FIX-ISS-22-23-05720
2023-03-13 14:32:26 +05:30
s-aga-r
442ee3adba
fix: operation time for multi-level BOM in WO
2023-03-13 14:31:38 +05:30
Ankush Menat
5bf6fb43a9
chore: fix broken TR translations
2023-03-13 14:12:12 +05:30
Deepesh Garg
7101e7acc4
fix: Filtering issue in payment entry ( #34332 )
2023-03-13 14:05:13 +05:30
