Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
33,408 Commits 3 Branches 0 Tags 1 GiB
2ed80656aa
Commit Graph

24370 Commits

Author SHA1 Message Date
marination
2ed80656aa chore: Code Cleanup 
- Validate capacity < stock level only on new rule
- Mention stock uom while validating capacity in new rule
- Separate function to format and display unassigned items
- Format ORM args
 2020-11-24 21:07:56 +05:30
marination
2fbaa5dc58 Merge branch 'putaway' of https://github.com/marination/erpnext into putaway 2020-11-24 17:39:19 +05:30
marination
68a49efc80 chore: Added Putaway Rule to Desk Page and added Priority to List View 2020-11-24 17:38:34 +05:30
Marica
e762bc67eb
Merge branch 'develop' into putaway 2020-11-24 17:28:34 +05:30
rohitwaghchaure
5ab2e6c1ff
Merge pull request #23991 from pateljannat/job-card-operation-field-error 
fix: job card error handling for operations field
 2020-11-24 17:05:44 +05:30
rohitwaghchaure
ccd554c19c
Merge pull request #23989 from Anurag810/item-maintain-stock-fixes 
fix: maintain stock can't be changed it there is product bundle
 2020-11-24 15:57:01 +05:30
pateljannat
b67ebc7636 fix: job card error handling for operations field 2020-11-24 15:37:30 +05:30
Deepesh Garg
d39ebf248e
Merge pull request #23990 from deepeshgarg007/shopify_order_id_sync 
fix: Old shopify order syncing date
 2020-11-24 15:12:53 +05:30
Deepesh Garg
43a830f3f5 fix: Old shopify order syncing date 2020-11-24 15:10:36 +05:30
Anurag Mishra
927106f552 fix: maintain stock can't be changed it there is product bundle 2020-11-24 15:02:52 +05:30
marination
ccbd432b56 chore: Added Tests 
- Fixed Sider Issues
- Added perms to Putaway Rule
- Added Unit Tests to check warehouse assignment
 2020-11-24 12:47:13 +05:30
Deepesh Garg
d07447aa5f
fix: Validation for duplicate Tax Category (#23978) 
* fix: Validation for duplicate Tax Category

* Update utils.py

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
 2020-11-24 08:09:17 +05:30
Afshan
6aa6ec1832
fix: clear error message when approval not available (#23971) 2020-11-24 08:01:19 +05:30
marination
0cec1477f2 chore: Format unassigned Items dialog and add freeze message 2020-11-23 19:19:35 +05:30
marination
90598ea19c chore: Multi UOM support for Putaway 
- Added UOM & conversion factor field in Putaway Rule
- Items are split and assigned as per UOM
- Handled Whole UOMs too
 2020-11-23 17:35:13 +05:30
rohitwaghchaure
b9b8a13393
Merge pull request #23980 from rohitwaghchaure/color-not-showing-in-bom-stock-report-develop 
fix: bom stock report color issue
 2020-11-23 16:43:32 +05:30
Rucha Mahabal
9a73a67dcd
Merge pull request #23982 from pateljannat/track-changes-in-stock-settings 
fix: enabling track changes for stock settings
 2020-11-23 15:57:48 +05:30
rohitwaghchaure
f9a44000d9
Update bom_stock_report.js 2020-11-23 15:40:06 +05:30
pateljannat
34f381df17 fix: enabling track changes for stock settings 2020-11-23 15:31:08 +05:30
Rohit Waghchaure
610d9ca649 fix: bom stock report color issue 2020-11-23 14:10:55 +05:30
marination
9596276b95 fix: Linter and Sider 2020-11-23 10:32:17 +05:30
Jannat Patel
34d07b6306
fix: purchase receipt to purchase invoice bill date mapping (#23967) 
Co-authored-by: pateljannat <jannatpatel@MacBook-Air.local>
 2020-11-20 19:22:35 +05:30
rohitwaghchaure
6b53ef7cce
Merge pull request #23947 from rohitwaghchaure/incorrect-delink-serial-no-and-batch 
fix: incorrect delink serial no and batch
 2020-11-20 13:45:17 +05:30
marination
c7991f8561 feat: Putaway Rule 2020-11-20 11:53:20 +05:30
Deepesh Garg
06e16eb748
Merge pull request #23941 from pateljannat/place-of-supply-change-issue 
fix: place of supply change on address change
 2020-11-20 11:13:19 +05:30
Rohit Waghchaure
ceab692f73 fix: incorrect delink serial no and batch 2020-11-20 00:25:03 +05:30
pateljannat
1d5d863e9a fix: removing return_taxes condition 2020-11-19 20:11:45 +05:30
Rohit Waghchaure
f0b1670abc fix: tds test case 2020-11-19 18:40:13 +05:30
marination
86e03325c3 Merge branch 'develop' of https://github.com/frappe/erpnext into putaway 2020-11-19 14:07:48 +05:30
Jannat Patel
c1187bc1d5
fix: duplicate items validation for POS Invoice when allow multiple items is disabled (#23896) 
* fix: duplicate items validation for POS when allow multiple items in disabled

* fix: variable name change for duplicate item validation

Co-authored-by: pateljannat <jannatpatel@MacBook-Air.local>
 2020-11-19 13:10:24 +05:30
pateljannat
cd05b34691 fix: company filter added again 2020-11-19 11:37:08 +05:30
Deepesh Garg
dd7a6d948c
Merge pull request #23672 from rohitwaghchaure/skip-non-apply-tds-invoices-develop 
fix: tds calculation, skip invoices with "Apply Tax Withholding Amount" has disabled
 2020-11-19 11:27:38 +05:30
Deepesh Garg
ebdc8cee5b
Merge pull request #23825 from igormbq/fix-demo 
fix: location data on Asset to use command(make_demo)
 2020-11-19 11:26:12 +05:30
Rucha Mahabal
14514f776b
fix: Enable Allow Auto Repeat for standard doctypes having auto_repeat field (#23776) 
Co-authored-by: Shivam Mishra <scmmishra@users.noreply.github.com>
 2020-11-19 08:17:16 +05:30
Marica
6dafe1eabf
feat: Formula based Quality Inspection (#23916) 
* feat: Formula based Quality Inspection

* chore: Added Test for Formula Based QI reading
 2020-11-19 08:12:58 +05:30
rohitwaghchaure
6e974bf246
Merge pull request #23949 from pateljannat/email-digest-user-not-found-issue 
fix: email digest user not found
 2020-11-18 23:54:34 +05:30
Smit Vora
bbe4933a52 fix(regional): set proper state code in ewaybill JSON when gst_category is SEZ 2020-11-18 21:00:09 +05:30
pateljannat
188657d05a fix: email digest user not found 2020-11-18 17:15:54 +05:30
rohitwaghchaure
67ba0462e9
Merge pull request #23408 from kevingdc/fix/item-price-duplicate-checking 
fix: Item price duplicate checking
 2020-11-18 16:41:48 +05:30
pateljannat
410db04b48 fix: linter issue for translation syntax 2020-11-18 15:57:16 +05:30
Deepesh Garg
a0b17c4ef6
Merge pull request #23836 from pateljannat/purchase-taxes-and-charges-account-name-issue 
fix: correcting description field in taxes and charges for accounts with account number + account name
 2020-11-18 15:31:25 +05:30
Deepesh Garg
81f6ef3e1a
Merge pull request #23934 from Anurag810/memebership-fixes 
fix: validation for membership
 2020-11-18 15:25:24 +05:30
Deepesh Garg
f0187f6db2
Merge pull request #23447 from hasnain2808/UAE-VAT-Format 
feat: UAE VAT 201 Report
 2020-11-18 15:15:00 +05:30
pateljannat
d0c528143f Merge branch 'place-of-supply-change-issue' of https://github.com/pateljannat/erpnext into place-of-supply-change-issue 2020-11-18 12:52:24 +05:30
pateljannat
8c9b60edfe fix: reversing previous commits and adding condition in regional controller 2020-11-18 12:51:13 +05:30
Saqib
d82b76fe0a
fix: pos item search includes non stock items (#23914) 
* fix: pos item search includes non stock items

* chore: add validation for non stock items
 2020-11-18 11:56:49 +05:30
Jannat Patel
96a0c17626
Merge branch 'develop' into place-of-supply-change-issue 2020-11-18 10:27:20 +05:30
Deepesh Garg
69232f8dd1 fix: Loan application link on creating loan 2020-11-17 22:00:41 +05:30
pateljannat
6b10d87d46 fix: place of supply change on address change 2020-11-17 20:34:51 +05:30
Anurag Mishra
3271437314
fix: Handle for custom field IFSC code in Bank remittance report. (#23905) 
* fix: Handel for custom field IFSC code

* fix: changes_requested
 2020-11-17 17:52:59 +05:30