Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
42,327 Commits 3 Branches 0 Tags 1 GiB
7b093e5803
Commit Graph

772 Commits

Author SHA1 Message Date
Deepesh Garg
991d3cdd76 fix: Incorrect discount amount on amended document 2021-07-01 21:17:17 +05:30
Deepesh Garg
3239f774bd
Merge pull request #26183 from deepeshgarg007/item_tax_fetch_fix_develop 
fix: User is not able to change item tax template
 2021-06-25 10:46:14 +05:30
Deepesh Garg
7b7796c1ed fix: Linting fixes 2021-06-24 21:13:18 +05:30
Deepesh Garg
8cdd7ce7b6 fix: Add python 3 compatible string types 2021-06-24 21:13:10 +05:30
Deepesh Garg
b4b76b75cd
Merge pull request #26176 from deepeshgarg007/item_tax_fetch_fix 
fix: User is not able to change item tax template
 2021-06-24 19:55:49 +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
Deepesh Garg
94d460412a fix: User is not able to change item tax template 2021-06-24 10:39:49 +05:30
Deepesh Garg
03b629c851
Merge pull request #26100 from deepeshgarg007/pi_billing_address 
fix: Billing address not fetched in Purchase Invoice
 2021-06-24 10:29:01 +05:30
Deepesh Garg
da7f45130b fix: Billing address not fetched in Purchase Invoice 2021-06-24 10:25:24 +05:30
Deepesh Garg
1f7b95f390 fix: User is not able to change item tax template 2021-06-23 20:56:27 +05:30
Saqib
fb89008a13
fix(pos): unsupported operand type -=: for 'float' and 'NoneType' (#26097) 2021-06-21 10:49:09 +05:30
Saqib
7ff19ebec8
fix(pos): unsupported operand type -= for 'float' and 'NoneType' (#26096) 2021-06-21 10:48:50 +05:30
Rohit Waghchaure
f0dfea1d47 fix: test case for Project Profitability report 2021-06-20 15:31:25 +05:30
Rohit Waghchaure
110e152fa3 fix: purchase invoice qty change not recalculate the consumed qty and added test cases for purchase invoice 2021-06-20 15:28:23 +05:30
Rohit Waghchaure
6bbc8ec3e8 fix: code cleanup and convert public method to private for subcontracting class 2021-06-20 15:27:04 +05:30
Rohit Waghchaure
5cc3f14506 fix: purchase invoice qty change not recalculate the consumed qty and added test cases for purchase invoice 2021-06-19 23:16:23 +05:30
Rohit Waghchaure
ddb0ec261a fix: code cleanup and convert public method to private for subcontracting class 2021-06-19 23:16:23 +05:30
Deepesh Garg
a58b571ccb fix: Billing address not fetched in Purchase Invoice 2021-06-18 10:45:35 +05:30
Ankush
fd84847f2b
fix: syntax fixes for native class (#26064) 2021-06-16 11:14:40 +05:30
Nabin Hait
0950481253 fix: merge conflict 2021-06-15 20:18:06 +05:30
Nabin Hait
d17217c4e2
Merge pull request #25831 from deepeshgarg007/tds_advance_payment_v13 
feat: Tax deduction against advance payments
 2021-06-10 20:25:30 +05:30
Deepesh Garg
5434dd048b Merge branch 'version-13-hotfix' of https://github.com/frappe/erpnext into dynamic_gst_rates 2021-06-10 18:56:39 +05:30
Deepesh Garg
6f2dacc60c Merge branch 'version-13-hotfix' of https://github.com/frappe/erpnext into tds_advance_payment_v13 2021-06-06 19:31:50 +05:30
Deepesh Garg
3646c301ed fix: Linting issues 2021-06-05 13:21:03 +05:30
Deepesh Garg
8a7e283926 feat: Item Taxes based on net rate 2021-06-04 22:53:26 +05:30
Rohan Bansal
a06ec03efc test: add test for new QI function 2021-06-02 14:55:31 +05:30
Deepesh Garg
2f5885627d fix: Labeling and other fixes 2021-06-01 11:07:18 +05:30
Nabin Hait
a3d1b6973a fix: merge conflict 2021-05-31 11:21:33 +05:30
Rohan Bansal
1cdf5a0dba fix: add requested changes 2021-05-26 14:42:15 +05:30
Rohan Bansal
c5b074269a Merge remote-tracking branch 'upstream/version-13-hotfix' into dev-quality-inspection-accounts 2021-05-26 14:32:14 +05:30
Ankush Menat
ff96bdf0c1
fix(ux): fix unstranslated text in msgprint/throw 2021-05-25 20:59:20 +05:30
Deepesh Garg
fd380d34f9 fix: Linting errors 2021-05-25 17:35:05 +05:30
Deepesh Garg
61c5e478af feat: Tax deduction against advance payments 2021-05-25 17:20:52 +05:30
Suraj Shetty
81d49e9c71 fix: Use extend_cscript function to properly extend class methods to cscript 2021-05-21 17:03:09 +05:30
rohitwaghchaure
651e934415
Merge pull request #25683 from noahjacob/supplier_item_group_link 
feat: linking supplier with an item group for filtering items
 2021-05-21 12:07:53 +05:30
noahjacob
ca2fb47d44 feat: updates item_code filters if item_group is linked to supplier 2021-05-18 15:01:05 +05:30
Suraj Shetty
a83d2aacd9
Merge branch 'develop' into esbuild 2021-05-18 14:48:28 +05:30
Deepesh Garg
83f98f6992
Merge pull request #25653 from deepeshgarg007/tax_labels 
fix: Client script breaking while settings tax labels
 2021-05-10 18:24:02 +05:30
Deepesh Garg
9f0823a164 fix: Linting issues 2021-05-10 16:07:41 +05:30
Deepesh Garg
13dfb9734c fix: Lable for transaction child tables 2021-05-10 15:38:32 +05:30
Deepesh Garg
1a48eb49cf fix: Client script breaking while settings tax labels 2021-05-10 14:37:10 +05:30
Faris Ansari
69eb6d476e Merge remote-tracking branch 'upstream/develop' into esbuild 2021-05-07 15:21:33 +05:30
Nabin Hait
7481f54e0c Merge branch 'version-13' into develop 2021-05-06 19:18:18 +05:30
Deepesh Garg
daf6c124a9 fix: Check if payment schedule exists 2021-05-06 16:47:02 +05:30
Deepesh Garg
be66ee9723 fix: Check if payment schedule exits before updating label 2021-05-06 16:46:55 +05:30
Deepesh Garg
a0ed517c85 fix: function call to update payment schedule labels 2021-05-06 16:46:47 +05:30
Deepesh Garg
ffea9d4126 fix: Check if payment schedule exists 2021-05-05 12:28:40 +05:30
Deepesh Garg
1bb7bb74ad fix: Check if payment schedule exits before updating label 2021-05-05 12:19:57 +05:30
Deepesh Garg
04923d6a65 fix: function call to update payment schedule labels 2021-05-04 21:01:12 +05:30
Saqib
cdc99cdd49
fix(pos): incorrect expense account set in pos invoice (#25543) 2021-05-03 11:54:55 +05:30
Saqib Ansari
3e83542360 fix: sider issues 2021-04-29 18:12:47 +05:30
Saqib Ansari
973afeac3c feat: set dynamic labels for payment schedule fields 2021-04-29 18:12:27 +05:30
Saqib Ansari
a91eebf6aa feat: base payment amount in payment schedule 2021-04-29 18:12:23 +05:30
Saqib Ansari
6fb417590f fix: sider issues 2021-04-29 14:05:20 +05:30
Saqib Ansari
c5c9f9a941 feat: set dynamic labels for payment schedule fields 2021-04-23 15:34:58 +05:30
Saqib Ansari
d552fe6778 feat: base payment amount in payment schedule 2021-04-23 14:46:52 +05:30
Faris Ansari
1fe891b287 refactor: Replace Class.extend with native class 2021-04-23 08:04:00 +05:30
Marica
e8bc912ffc
perf: Fetching exchange rate on every line item slows down PO (#25345) 
* fix: Dont fetch exchange rates for each line item once fetched at parent
`

* perf: Use price list conversion rate from parent

- If price list conversion rate exists in args already from earlier call, use that
- `get_price_list_currency_and_exchange_rate` wont be called for each child row

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
 2021-04-19 11:05:21 +05:30
Anupam Kumar
ee0dda6ba5
Merge branch 'develop' into planning 2021-04-15 12:48:25 +05:30
Marica
4e25aa77dd
Merge branch 'develop' into dev-quality-inspection-accounts 2021-04-14 19:06:14 +05:30
Rohan Bansal
03f711e3a2 style: sider issues 2021-04-14 14:41:55 +05:30
Rohan Bansal
7f8b95efe8 fix: move QI logic to stock module 2021-04-14 14:15:45 +05:30
Deepesh Garg
b67058869a
fix: Round off final tax amount instead of current tax amount (#25188) 
* fix: Round off final tax amount instead of current tax amount

* fix: Syntax error

* fix: Indentation

* fix: Round Off taxes order execution

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
 2021-04-14 11:20:27 +05:30
Rushabh Mehta
65f25c27b3 fix(minor): fix dynamically changing grid properties 2021-04-13 11:58:16 +05:30
Anupam Kumar
cd2aedd0c6
Merge branch 'develop' into planning 2021-04-09 17:59:47 +05:30
Jannat Patel
d9fa79de99
fix: serial no refresh issue (#25127) 
* fix: serial no refresh issue

* fix: sider
 2021-04-08 16:04:57 +05:30
Anupam Kumar
dfdf72cbb2
Merge branch 'develop' into planning 2021-04-08 10:58:05 +05:30
Rohan Bansal
a93b514b2f feat: create Quality Inspections from account and stock documents 2021-04-06 17:20:16 +05:30
Anupam Kumar
1033cf72f6
fix: added flag for dont_fetch_price_list_rate in transaction (#25041) 2021-03-31 19:39:45 +05:30
rohitwaghchaure
d5759bab11
Merge pull request #24922 from rohitwaghchaure/feat-recursice-pricing-rule 
feat: recursive pricing rule
 2021-03-26 19:10:10 +05:30
Anupam Kumar
d1bbb4c311
Merge branch 'develop' into planning 2021-03-24 15:12:04 +05:30
Jannat Patel
12f0923a61
fix: serial no trim issue (#24949) 
* fix: serial no trim issue

* fix: valid serial nos

* fix: sider

Co-authored-by: Marica <maricadsouza221197@gmail.com>
 2021-03-23 21:09:49 +05:30
Anupam
4980dd616b fix: resolving commits 2021-03-22 11:23:47 +05:30
Rohit Waghchaure
77add49c6a fix: don't club same free item 2021-03-17 18:49:54 +05:30
Rohit Waghchaure
a9b1347600 fix: nonetype object has no attribute options 2021-03-17 14:30:34 +05:30
Rohit Waghchaure
ff70e61d7a feat: recursive product discount 2021-03-17 14:30:34 +05:30
Anupam Kumar
ed42afc5e8
feat: price margin in buying (#24685) 2021-03-15 11:11:28 +05:30
Marica
63eb6bdb3c
Merge pull request #24643 from CaseSolvedUK/sinvfix-v13 
fix: Don't throw exception on invoice lines when there is no item_code
 2021-03-11 10:47:24 +05:30
casesolved-co-uk
a780306ec7 fix: Don't throw exception on invoice lines when there is no item_code (fixes #24640) 2021-03-10 15:50:45 +00:00
Afshan
d95b59e90c fix: call function when arguments available 2021-03-08 18:19:53 +05:30
Deepesh Garg
6a5ef261f2
feat: Normal rounding for GST Taxes (#24488) 
* feat: Normal rounding for GST Taxes

* fix: Add test case

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
 2021-02-19 14:30:23 +05:30
Anupam Kumar
7e1dcf911d
feat: capture Rate of stock UOM in purchase (#24315) 
* feat: capture Rate of stock UOM in purchase

* fix: review changes

* added server side code

* added stock uom rate in sales transactions

* fix: review changes

* fix: resolving conflicts

* adding patch

* fix: removing patch
 2021-02-11 20:19:30 +05:30
Afshan
ee87484134
fix: calculated discount percentage (#24510) 
* fix: calculated discount percentage

* fix: slider

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
 2021-02-11 20:11:58 +05:30
Suraj Shetty
0a8939e1c1 Merge branch 'develop' of https://github.com/frappe/erpnext into rebrand-ui 2021-01-29 08:56:22 +05:30
Deepesh Garg
b4be292217
fix: Item valuation for internal stock transfers (#24200) 
* fix: Item valuation for internal stocktransfers

* fix: Consider conversion factor for invoices

* fix: Add missing set warehouse fields

* fix: Add validations and other fixes

* fix: Fixes in flow

* fix: Internal sales item link in Purchase Invoice

* fix: Debugging

* fix: Debug travis

* fix: Remove commented code

* fix: Rate forcing in sales order

* fix: Unreallized profit in Sales Register

* fix: Item wise gst sales register fix

* fix: From warehouse in Purchase Order

* fix: Target field in Sales Invoice

* fix: remove self

* fix: GST Purchasse register and other fixes

* fix: Add shipping_address to no field map

* fix: Ref doc map

* fix: Test Cases

* fix: address mapping between sales and purchase document

* fix: Import Error

* fix: Tax updation for internal invoices

* fix: Purchase Order and Invoice linking

* fix: Internal Party validation fix

* fix: validation

* fix(india): GST Taxes for intra state transfer

* fix(india): GST Taxes for intra state transfer

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
 2021-01-28 13:09:56 +05:30
Deepesh Garg
16bcd01f6d
feat: Provision to disable serial no and batch selector (#24398) 
* feat: feat: Provision to disbale serial no and batch selector

* fix: Sider issues

* fix: Linting issues
 2021-01-28 12:09:35 +05:30
Deepesh Garg
bd9bdc5797
feat: Batch wise item pricing (#24470) 
* feat: Batch wise item pricing

* fix: Rate for items with no batch

* fix: Add test case for batch pricing

* fix: Sider Issues

* fix: Add item filter for batch
 2021-01-28 12:05:57 +05:30
Suraj Shetty
bbc6bfd3c3 Merge branch 'develop' of https://github.com/frappe/erpnext into rebrand-ui 2021-01-19 09:34:06 +05:30
Marica
6ac51edc56
Merge branch 'develop' into putaway 2021-01-18 17:47:25 +05:30
Deepesh Garg
cbed6f970a Merge branch 'develop' of https://github.com/frappe/erpnext into accounting_dimension_filters 2021-01-15 15:43:59 +05:30
Saqib
1f591ab02e
fix(e-invoicing): minor calculation fixes (#24285) 2021-01-05 13:53:51 +05:30
Deepesh Garg
4a8c2c4cb5 Merge branch 'develop' of https://github.com/frappe/erpnext into accounting_dimension_filters 2020-12-29 15:10:36 +05:30
rohitwaghchaure
527b7e16e5
Revert "feat: Batch wise item selling pricing" 2020-12-28 15:29:30 +05:30
Deepesh Garg
d3814b2676 Merge branch develop into batch-wise-pricing 2020-12-28 10:48:29 +05:30
Marica
406af27b9e
Merge branch 'develop' into putaway 2020-12-14 13:07:50 +05:30
marination
c47d38dc18 chore: Stock Entry Tests and fixes 
- Maintain item-warehouse wise rules for Stock Entry Material Transfer
- Test cases for Stock Entry with more use cases
- Sider fixes
 2020-12-14 12:12:49 +05:30
Suraj Shetty
f2511c84b5 Merge branch 'develop' of https://github.com/frappe/erpnext into rebrand-ui 2020-12-14 09:05:48 +05:30
Deepesh Garg
f17ea2ccab
fix: Accounting for internal transfer invoices within same company (#24021) 
* fix: Accounting for internal transfer invoices within same company

* fix: warehouse fetching

* fix: Linting issues

* fix: GL entry fixes and validation for intercompany account

* fix: Account naming changes and other fixes

* fix: Add test for internal transfer

* fix: Test Case

* fix: Add description for fields

* fix: Commonfied code

* fix: Map warehouse and serial no
 2020-12-11 21:30:39 +05:30
Suraj Shetty
dc13d4b0fc Merge branch 'develop' of https://github.com/frappe/erpnext into rebrand-ui 2020-12-11 12:57:04 +05:30
Marica
3bc69e59ec
Merge branch 'develop' into update-barcode-if-scan-barcode-used 2020-12-10 18:05:00 +05:30
Mohammad Hasnain Mohsin Rajan
8abe7b91fe
fix: linting 
Co-authored-by: Marica <maricadsouza221197@gmail.com>
 2020-12-10 17:48:22 +05:30
Mohammad Hasnain Mohsin Rajan
ce1ca28296
fix: linting 
Co-authored-by: Marica <maricadsouza221197@gmail.com>
 2020-12-10 17:48:05 +05:30
Rushabh Mehta
39154e5296 fix(minor): add debounce to calls 2020-12-10 12:37:16 +05:30
marination
a5d8d32775 chore: Test and fixes 
- Tests as per new design flow
- Fixed duplicate data bug in Warehouse Capacity Summary
- Set Amount currently on applying rule in client side
- Apply rules on server side before validate
 2020-12-09 16:27:18 +05:30
Deepesh Garg
bc0a2859e4 fix: Rate for items with no batch 2020-12-09 12:40:09 +05:30
Mohammad Hasnain Mohsin Rajan
deaf2e80cb
fix: linting 2020-12-09 12:36:14 +05:30
Mohammad Hasnain
69514c4761 fix: scan barcode does not update barcode item field in sales order 2020-12-09 12:10:28 +05:30
Deepesh Garg
91e1136d2c feat: Batch wise item pricing 2020-12-08 22:53:03 +05:30
marination
0f3cfc502b feat: Trigger rule application from client side 
- Table is reset and overwritten with applied rules on checkbox trigger
- Sider fixes
 2020-12-08 19:44:29 +05:30
Marica
0b68243979
Merge branch 'develop' into putaway 2020-12-08 11:44:00 +05:30
marination
fac4035f23 feat: Apply Putaway Rules within transaction itself 
- Added checkbox 'Apply Putaway Rule' in PR and SE
- Added link to rule in child tables
- Rule is applied on Save
- Validation for over receipt
- Apply Rule on Stock Entry as well for Material Transfer and Receipt
 2020-12-07 21:35:49 +05:30
rohitwaghchaure
0a672b69e6
Merge pull request #22859 from marination/pr-dn-return 
feat: Return tracking in PR/DN
 2020-12-06 22:43:34 +05:30
Marica
afc517b8bf
Merge branch 'develop' into link-to-mr 2020-12-04 16:30:40 +05:30
Deepesh Garg
12b45b3f2a Merge branch 'develop' of https://github.com/frappe/erpnext into accounting_dimension_filters 2020-12-02 12:46:23 +05:30
Marica
307bd01504
Merge branch 'develop' into pr-dn-return 2020-11-25 17:24:03 +05:30
Mohammad Hasnain Mohsin Rajan
90e33e53fd
refactor: Format translation strings (#24004) 
* fix: translation strings

* fix: linting
 2020-11-25 15:37:54 +05:30
Mohammad Hasnain Mohsin Rajan
e15b6a91de
Filters for tax templates (#23998) 
* feat: add company filter to tax templates

* fix: remove filer from PO because it is from tran

* fix: linting

* fix: solve translation string issues

* fix: remove doctype name
 2020-11-25 15:36:41 +05:30
Deepesh Garg
1a4390de44 Merge branch 'develop' of https://github.com/frappe/erpnext into accounting_dimension_filters 2020-11-25 14:51:11 +05:30
Deepesh Garg
6b9dda5f3e fix: Move filter setup to doctype controllers 2020-11-25 14:49:10 +05:30
Marica
9b897c4073
Merge branch 'develop' into pr-dn-return 2020-11-19 12:21:38 +05:30
Deepesh Garg
f916bc048f fix: Remove cost center query from doctypes 2020-11-15 22:44:39 +05:30
pateljannat
7e4d115e36 fix: sider issues fixed 2020-11-11 09:52:27 +05:30
pateljannat
b648b9cf93 fix: code review changes 2020-11-10 18:50:02 +05:30
Suraj Shetty
e3fe8ff195
Merge branch 'develop' into purchase-taxes-and-charges-account-name-issue 2020-11-09 19:16:23 +05:30
Marica
d845e8a53a
Merge branch 'develop' into pr-dn-return 2020-11-06 12:25:11 +05:30
pateljannat
5b02d32826 fix: trailling spaces removed 2020-11-05 18:04:14 +05:30
pateljannat
403822afb3 fix: correcting description field in taxes and charges for accounts that have account number + account name 2020-11-05 16:24:33 +05:30
marination
28dd90f3dc Merge branch 'develop' of https://github.com/frappe/erpnext into pr-dn-return 2020-11-02 15:16:31 +05:30
marination
d6596a169c fix: Billing % Logic and Map Pending Qty only in PR and DN 
- Billing % should consider unreturned amount as total
- While mapping to return doc, map unreturned amount
- Added field Received Qty in Stock UOM, to tally against Returned Qty in PR
- PR billing percentage updation custom function
- In patch set received qty in stock uom first, then update returned qty and billing
 2020-11-02 15:07:48 +05:30
Marica
e0ec58d8fa
Merge branch 'develop' into link-to-mr 2020-11-01 23:48:58 +05:30
marination
e14fdf4a3c chore: RFQ cleanup and Title case for 'Get Items From' 
- Cleanup up RFQ Get Items From Dialogs
- Title cased 'Get items from' to 'Get Items From'
 2020-10-30 17:06:00 +05:30
Marica
8f6bd851d3
chore: Show Toast alert feedback on Scanning Barcode (#23760) 2020-10-29 18:55:52 +05:30
Saqib
7d9dd3c628
fix: item wise tax calculation (#23744) 2020-10-28 17:07:10 +05:30
Marica
16a1f7e7e3
Merge branch 'develop' into link-to-mr 2020-10-27 11:49:35 +05:30
Saqib
60212ff9b9
fix: multiple pos issues (#23347) 
* fix: point of sale search

* fix: pos fetches expired serial nos

* fix: pos doesn't refresh on route change

* fix: opening balances not set in opening entry

* fix: remove debug statement

* fix: invalid query if no serial no is reserved by pos invoice

* chore: make new order btn primary

* chore: filter warehouse by company

* chore: add shortcuts for new order and email

* fix: cannot fetch serial no if no batch control

* chore: add shortcuts for menu items

* feat: standard keyboard shortcuts for pos page

* feat: display only items that are in stock

* fix: empty point of sale page if opening entry dialog is closed

* feat: conversion factor in pos item details

* fix: show all invalid mode of payments

* chore: show all items if allow negative stock is checked

* fix: -ve amount set when changing mode of payment

* fix: pos closing validations

* fix: test

* fix: non expired serial no fetching query

* fix: cannot dismiss pos opening creation dialog

* fix: transalation strings

* fix: msgprint to throw

* chore: use as_list in frappe.throw

* chore: clean up pos invoice.js & .py

* fix: codacy

* fix: transalation syntax

* fix: codacy

* fix: set_missing_values called twice from pos page

* fix: mode selector with double spaces

* fix: do not allow tables in pos additional fields

* fix: pos is not defined

* feat: set mode of payments for returns

* fix: remove naming series from pos profile

* fix: error message

* fix: minor bugs

* chore: re-arrange pos closing entry detail fields

* fix: sider & frappe linter

* fix: more translation strings

* fix: travis

* fix: more translation strings

* fix: sider

* fix: travis

* fix: unexpected end of string

* fix: travis

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
 2020-10-26 11:17:04 +05:30
Marica
ca5ad076d5
Merge branch 'develop' into link-to-mr 2020-10-16 16:49:38 +05:30
marination
359778e235 chore: Code cleanup, reduce redundancy 2020-10-16 16:47:23 +05:30
marination
be4dbad823 style: (minor) Reduce loc 2020-09-24 16:43:25 +05:30
marination
a119688e32 fix: (RFQ/SQ) Link to Material Requests in Tools section 2020-09-24 15:57:43 +05:30
marination
8370d9b997 fix: Check Company in Payment Entry before selecting values 2020-09-24 11:51:03 +05:30
SDLyu
68672af8ab
Fix missing tax autoload when frm.doc.taxes is [] 2020-09-18 13:58:23 +08:00
Marica
65c2c4f85f
Merge branch 'develop' into item-tax-update-items 2020-09-15 09:49:06 +05:30
marination
b7cd84196d fix: Revert tax calculation changes 2020-09-15 09:42:51 +05:30
Saqib
cd89994b33
fix: multiple pos issues (#23297) 
* fix: returns can be made against unconsolidated invoices

* fix: indentation

* fix: mode of payment not fetching for pos returns

* patch: default pos profile print format

* fix: tests

* chore: clean up retail desk page
 2020-09-10 19:28:46 +05:30
Afshan
eb4b2aa142
fix: get_items from product bundle for purchase order (#22821) 
* fix: get_items from product bundle for purchase order

* fix: Don't overwrite  doctype while setting attributes in child row

Co-authored-by: Marica <maricadsouza221197@gmail.com>
 2020-09-01 15:01:32 +05:30
Deepesh Garg
d79b511e3f
Merge pull request #22950 from deepeshgarg007/billing_address_fetch 
fix: Add default billing address for purchase documents
 2020-08-31 17:16:31 +05:30
marination
22d3729427 fix: Codacy 2020-08-19 15:42:40 +05:30
marination
698d983eef fix: Item Tax Updation via Update Items in SO/PO 2020-08-19 14:59:46 +05:30
Deepesh Garg
7d0a625b9c
git commit -m "fix: Add missing semicolon" 2020-08-11 22:02:12 +05:30