Commit Graph

30394 Commits

Author SHA1 Message Date
Sahil Khan
21b34b9607 fix(patch): reload 'Import Supplier Invoice' doc 2020-04-17 13:22:28 +05:30
Sahil Khan
44f0c077ff fix(patch): reload 'Import Supplier Invoice' doc 2020-04-17 13:15:15 +05:30
Sahil Khan
d959463cbc Merge branch 'v12-pre-release' into version-12 v12.7.0 2020-04-17 11:27:54 +05:30
Sahil Khan
e6d02ecd7f bumped to version 12.7.0 2020-04-17 11:47:54 +05:50
Nabin Hait
3b2aa5ead3 fix: requested qty for customer provided item and rate for sales (#21300)
* fix: requested qty for customer provided item and rate for sales

* fix: requested qty for material transfer

* fix: customer provided item can be sales item

* fix: requested qty test cases
2020-04-17 10:52:23 +05:30
Nabin Hait
4770626bbd fix: requested qty for customer provided item and rate for sales (#21301)
* fix: requested qty for customer provided item and rate for sales

* fix: requested qty for material transfer

* fix: customer provided item can be sales item

* fix: requested qty test cases
2020-04-17 10:52:18 +05:30
rohitwaghchaure
df045e9f6d Merge pull request #21308 from rohitwaghchaure/fixed_job_card_time_issue_pre_release
fix: job card timer issue
2020-04-17 00:56:16 +05:30
rohitwaghchaure
2c045179a3 Merge pull request #21310 from rohitwaghchaure/fixed_timer_issue_version_12_hotfix
fix: job card timer issue
2020-04-17 00:55:50 +05:30
Rohit Waghchaure
da83af1213 fix: job card timer issue 2020-04-17 00:54:20 +05:30
Rohit Waghchaure
c10c920914 fix: job card time issue 2020-04-17 00:48:08 +05:30
rohitwaghchaure
61fc2d3263 fix: job card time issue (#21306) 2020-04-16 23:57:49 +05:30
rohitwaghchaure
a66be0f5c5 Merge pull request #21295 from nabinhait/b12-7-pre-release-fix1
fix: requested qty calculation and some other small fixes
2020-04-16 19:19:17 +05:30
rohitwaghchaure
fd99cc8494 Merge pull request #21294 from nabinhait/b12-7-pre-release-1
fix: requested qty calculation and some other small fixes
2020-04-16 19:18:54 +05:30
Nabin Hait
cf1f777ae2 Merge branch 'version-12-hotfix' into b12-7-pre-release-fix1 2020-04-16 19:08:35 +05:30
Nabin Hait
9ea9ed4256 Merge branch 'v12-pre-release' into b12-7-pre-release-1 2020-04-16 19:07:45 +05:30
Deepesh Garg
c7b5309dcd Merge pull request #21105 from nextchamp-saqib/asset-cat-validation-v12
fix: no server side validations for accounts in asset category
2020-04-16 16:25:37 +05:30
Saqib
65eea97e0c fix: serial and batch selection from delivery note bug fix (#21293) 2020-04-16 16:22:16 +05:30
Saqib
45d454b14d fix: serial and batch selection from delivery note bug fix (#21292) 2020-04-16 16:21:54 +05:30
Saqib Ansari
f390b8062c fix: incorrect transalation 2020-04-16 16:16:58 +05:30
Nabin Hait
90adf076f3 fix: Made received qty readonly and no-copy 2020-04-16 14:30:26 +05:30
Nabin Hait
2b6942d9ce fix: Made release date mandatory 2020-04-16 14:30:18 +05:30
Nabin Hait
4dca806737 fix: requested qty calculation fix for UOM 2020-04-16 14:28:22 +05:30
Nabin Hait
bd57cbda03 fix: requested qty calculation fix for UOM 2020-04-16 14:27:25 +05:30
Nabin Hait
31c8f8e795 chore: added change log v12.7.0 (#21289) 2020-04-16 12:46:42 +05:30
Nabin Hait
ccfc005932 fix: Made received qty readonly and no-copy 2020-04-16 11:25:15 +05:30
Nabin Hait
b4dfc8e1bf fix: Made release date mandatory 2020-04-16 11:24:43 +05:30
Deepesh Garg
3379cac956 Merge branch 'version-12-hotfix' into asset-cat-validation-v12 2020-04-16 11:23:21 +05:30
Deepesh Garg
ed48755a6f Merge pull request #21266 from vishdha/chart_account_hotfix
fix: Chart of account importer UX improved
2020-04-16 11:21:44 +05:30
vishdha
c43e759b87 fix: fix Transalation 2020-04-16 11:12:52 +05:30
rohitwaghchaure
05e9af60bd Merge pull request #21284 from marination/stock-entry-get-items-mr-hotfix
fix: Fetch Material Requests with type Issue as well in Stock Entry via Get Items from
2020-04-16 00:33:15 +05:30
Marica
3635b17f22 Merge pull request #21287 from nextchamp-saqib/warehouse-fix-pre-release
fix: warehouse unset when cannot find item warehouse
2020-04-15 23:56:39 +05:30
Marica
de9220568e Merge pull request #21286 from nextchamp-saqib/warehouse-fix
fix: warehouse unset when cannot find item warehouse
2020-04-15 23:55:52 +05:30
Saqib Ansari
5d3e211531 fix: warehouse unset when cannot find item warehouse
* cannot set delivery date when all items gets deleted and new are added
2020-04-15 22:10:00 +05:30
Saqib Ansari
bde676ef74 fix: pos not accessible without default customer 2020-04-15 22:09:50 +05:30
Saqib Ansari
4879858657 fix: warehouse unset when cannot find item warehouse
* cannot set delivery date when all items gets deleted and new are added
2020-04-15 22:08:12 +05:30
Saqib Ansari
773eb6ce68 fix: pos not accessible without default customer 2020-04-15 22:08:04 +05:30
marination
8e1201d31e fix: Fetch Material Requests with type Issue as well in Stock Entry via Get Items from 2020-04-15 21:25:12 +05:30
rohitwaghchaure
18a04a24b3 Merge pull request #21278 from marination/default-item-manufacturer-pre-release
feat: Provision to set Default Item Manufacturer
2020-04-15 16:47:47 +05:30
marination
64f053d583 feat: Provision to set Default Item Manufacturer
- Is Default checkbox added in Item Manufacturer
- Default Item Manufacturer and Part No fields added to Item Master
- Manufacturer Part No field editable in all child tables with validation
- Manufacturer and Part No auto fetched via get_item_details in child table
2020-04-15 16:43:41 +05:30
rohitwaghchaure
bf401290d1 Merge pull request #21218 from marination/default-item-manufacturer-hotfix
feat: Provision to set Default Item Manufacturer
2020-04-15 16:36:01 +05:30
Nabin Hait
1fc8de32f1 fix: merge conflict 2020-04-14 20:31:50 +05:30
rohitwaghchaure
09f6199b36 fix: pick list test (#21267) 2020-04-14 19:43:26 +05:30
Rohan
b0f000b1c8 fix: order_type validation restriction (#18096) (#21264)
Co-authored-by: Don-Leopardo <46027152+Don-Leopardo@users.noreply.github.com>
2020-04-14 19:42:21 +05:30
Nabin Hait
49b653b444 fix: merge conflict 2020-04-14 19:34:48 +05:30
Nabin Hait
107229de04 fix: Fixed expense claim payment status 2020-04-14 19:33:05 +05:30
vishdha
af33f71562 fix: message bold 2020-04-14 17:20:48 +05:30
vishdha
25c26b5904 fix: Chart of account importer UX improved 2020-04-14 17:20:48 +05:30
Deepesh Garg
1112bd0f23 Merge pull request #21260 from Alchez/v12-stock-available-order-desk
fix: [minor] show stock UOM in POS (v12)
2020-04-14 17:00:49 +05:30
rohitwaghchaure
8c931e4185 Merge pull request #21263 from rohitwaghchaure/fixed_stock_reco_test_case
fix: stock reco test case
2020-04-14 14:50:49 +05:30
Rohit Waghchaure
5771aabc49 fix: stock reco test case 2020-04-14 14:49:47 +05:30