Commit Graph

37114 Commits

Author SHA1 Message Date
Deepesh Garg
970d2af7ad
Merge pull request #26211 from deepeshgarg007/include_dimension_filter
fix: Account filter not working with accounting dimension filter
2021-06-24 19:55:12 +05:30
Deepesh Garg
1564d39bf4
Merge pull request #26188 from deepeshgarg007/internal_transfer_payment_tax_v13
fix: Taxes on Internal Transfer payment entry
2021-06-24 19:51:48 +05:30
Deepesh Garg
e3ca177828 fix: Remove debug flag 2021-06-24 19:51:23 +05:30
Deepesh Garg
bdba29bab5 fix: Account filter not working with accounting dimension filter 2021-06-24 19:48:11 +05:30
Ankush
5708b7140b
fix: batch nos in packed items (bp #26105)
* test: batch info in packed_items

* fix(ux): make packed items editable

* refactor: allow custom table name for set_batch

In some doctypes there are multiple child tables requiring batched
items. This change makes the function a bit more flexible.

* fix: Auto fetch batch_nos in packed_item table
2021-06-24 19:38:37 +05:30
Noah Jacob
ac0bc1f170
fix: precision rate for packed items (#26208) 2021-06-24 19:36:17 +05:30
Saqib
b3a0a7b432
fix: too many writes while renaming company abbreviation (#26203) 2021-06-24 19:30:10 +05:30
Saqib
64c6b34b94
fix: too many writes while renaming company abbreviation (#26142) 2021-06-24 19:29:56 +05:30
Saqib
3b5978cdb8
Merge pull request #26093 from nextchamp-saqib/pr-item-gl-fix
fix: purchase receipt gl entries with same item code
2021-06-24 19:29:08 +05:30
Deepesh Garg
1658107a92 fix: Linting fixes 2021-06-24 19:18:50 +05:30
Deepesh Garg
e21e435a0d fix: Add python 3 compatible string types 2021-06-24 19:17:58 +05:30
Nabin Hait
a57976660a fix: merge conflict 2021-06-24 19:14:33 +05:30
Ankush
7a63d782db
fix: batch nos in packed items (#26105)
* test: batch info in packed_items

* fix(ux): make packed items editable

* refactor: allow custom table name for set_batch

In some doctypes there are multiple child tables requiring batched
items. This change makes the function a bit more flexible.

* fix: Auto fetch batch_nos in packed_item table
2021-06-24 19:07:16 +05:30
Deepesh Garg
9382b1f154 fix: Flaky test 2021-06-24 19:03:22 +05:30
Deepesh Garg
acbf56f162
Merge pull request #26182 from deepeshgarg007/gstr_1_export_invoices_error_develop
fix: Export invoices not visible in GSTR-1 report
2021-06-24 18:43:40 +05:30
Deepesh Garg
11591b3e3e
Merge pull request #26202 from nextchamp-saqib/pr-item-gl-fix-v13
fix: purchase receipt gl entries with same item code
2021-06-24 18:36:23 +05:30
Anuja Pawar
a50196bcd9
fix: dunning permission error in payment entry (#26204) 2021-06-24 18:25:16 +05:30
rohitwaghchaure
27797ffa46
Merge pull request #24523 from rohitwaghchaure/sub-operation-new-branch
Feat: Job Card Enhancements
2021-06-24 18:19:42 +05:30
Rohit Waghchaure
2330c41cca fix: total time calculation 2021-06-24 18:14:19 +05:30
Rohit Waghchaure
57307443f0 is corrective job card 2021-06-24 18:14:19 +05:30
Rohit Waghchaure
c878389050 fix: or condition filter in the get_all 2021-06-24 18:14:18 +05:30
Jannat Patel
6a9798f305
fix: update leave allocation after submit (#26191)
* fix: update leave allocation after submit v13

* fix: test

* fix: test
2021-06-24 18:11:33 +05:30
Rohit Waghchaure
fcab53b238 fix: skip job card 2021-06-24 18:07:31 +05:30
Rohit Waghchaure
6e81489095 feat: Job Card Enhancements 2021-06-24 18:07:30 +05:30
Saqib Ansari
f6dce4df73 test: service item purchase with perpetual inventory enabled 2021-06-24 17:41:52 +05:30
Saqib Ansari
1ca8f6a51d fix: purchase receipt gl entries with same item code 2021-06-24 17:41:44 +05:30
Saqib
c10fea8a59
Merge branch 'develop' into pr-item-gl-fix 2021-06-24 17:39:36 +05:30
Saqib
2980db30ce
Merge pull request #26157 from nextchamp-saqib/pos-fixes-9
refactor(pos): use pos invoice item name as unique identifier
2021-06-24 17:38:41 +05:30
Saqib
81d164134d
Merge pull request #26198 from nextchamp-saqib/pos-fixes-9-v13
refactor(pos): use pos invoice item name as unique identifier
2021-06-24 17:37:51 +05:30
Afshan
9dc625c1c9
fix: validate product bundle for existing transactions before deletion (#25978) 2021-06-24 17:36:39 +05:30
Deepesh Garg
79daed00c1
Merge pull request #26201 from noahjacob/shipping_address_fix_v13
fix: fetch preferred shipping address (bp #26132)
2021-06-24 17:35:34 +05:30
Deepesh Garg
755ebdf582
Update party.js 2021-06-24 17:35:14 +05:30
Deepesh Garg
e693cceb58
Merge pull request #26132 from noahjacob/shipping_address_fix
fix: fetch preferred shipping address
2021-06-24 17:31:21 +05:30
Deepesh Garg
f84f8d5260
Update party.js 2021-06-24 17:29:55 +05:30
Noah Jacob
da82bd4b51
refactor: update cost updates operation time and hour rates in BOM (#25891)
* refactor: updates hour_rate and operation time on update cost

* refactor: hour_rates are updated in routing when updated in workstations

* test: test cases for updating hour_rates and operation time in linked bom
2021-06-24 17:23:21 +05:30
Noah Jacob
dbdf2515cd fix: fetches correct preferred shipping address 2021-06-24 17:06:18 +05:30
Nabin Hait
5b462ad11a fix: merge conflict 2021-06-24 15:36:51 +05:30
Nabin Hait
4704003c94 Merge branch 'version-13-pre-release' into version-13 2021-06-24 15:35:50 +05:30
Nabin Hait
b5d1a7731c bumped to version 13.5.2 2021-06-24 15:55:50 +05:50
Nabin Hait
c1954ec72a
Merge pull request #26195 from deepeshgarg007/deferred_revenue_error
fix: Error while booking deferred revenue
2021-06-24 15:35:02 +05:30
Nabin Hait
7a8a449ed4
Merge pull request #26197 from deepeshgarg007/deferred_revenue_error_pre_release
fix: Error while booking deferred revenue
2021-06-24 15:34:58 +05:30
GangaManoj
e21d44c5c3 fix(Asset): Remove to_date field 2021-06-24 15:04:44 +05:30
Saqib Ansari
3b12601461 fix: sider issues 2021-06-24 15:03:04 +05:30
Saqib Ansari
e39c3f2e69 fix: add missing semicolons 2021-06-24 15:02:59 +05:30
Saqib Ansari
ea70f6f933 fix: hide images from cart & details 2021-06-24 15:02:53 +05:30
Saqib Ansari
54cc1dedf2 refactor(pos): use pos invoice item name as unique identifier 2021-06-24 15:02:43 +05:30
Saqib Ansari
4d3e748c00 fix: sider issues 2021-06-24 15:01:33 +05:30
Marica
bf3e191570
Merge pull request #26193 from marination/country-modal-cart-v13-release
fix: Address Card issues in e-commerce
2021-06-24 14:57:39 +05:30
Marica
b5ffaff6a8
Merge pull request #26194 from marination/web-item-group-v13-pre-release
fix: Website item group logic for product listing in Item Group pages
2021-06-24 14:57:29 +05:30
GangaManoj
2fdb923953 fix(Asset Repair): Change controller hooks 2021-06-24 14:56:34 +05:30