Afshan
d5710b4d6f
style: removed extra spaces
2020-09-17 13:01:47 +05:30
Afshan
e813684433
fix: warehouse address filtered based on warehouse
2020-09-17 12:57:26 +05:30
Deepesh Garg
2aea184f6f
Merge pull request #23309 from anupamvs/sales-analytics
...
feat: added project in Sales Analytics report
2020-09-17 12:37:14 +05:30
Rucha Mahabal
86864f5838
Merge pull request #23345 from ruchamahabal/fix-address-contact
...
fix(Non Profit): Hide Address and Contact section for unsaved docs
2020-09-16 23:51:27 +05:30
Rucha Mahabal
c78ca36ee5
fix(Non Profit): Hide Address and Contact section for unsaved docs
2020-09-16 23:47:33 +05:30
Anupam Kumar
11649efc41
Merge branch 'develop' into sales-analytics
2020-09-16 21:45:57 +05:30
Deepesh Garg
5c04b2eea4
Merge pull request #23235 from Anurag810/custom_remark
...
feat: added option to add custom remarks in payment entry
2020-09-16 13:38:04 +05:30
Deepesh Garg
15f698251b
Merge pull request #23079 from marination/item-tax-update-items
...
fix: Item Tax Updating via `Update Items` in SO/PO
2020-09-15 20:47:20 +05:30
Deepesh Garg
db52cfe05a
Merge pull request #22849 from alyf-de/datev_refactor
...
refactor: move datev-specific stuff to utils
2020-09-15 19:50:00 +05:30
Marica
f63b6719e3
Merge branch 'develop' into item-tax-update-items
2020-09-15 17:45:05 +05:30
marination
f995f517c9
fix: Test
2020-09-15 17:06:27 +05:30
Deepesh Garg
a11d35ce7b
Merge pull request #23331 from deepeshgarg007/tds_category_trigger
...
fix: Supplier trigger onload
2020-09-15 15:05:19 +05:30
Deepesh Garg
2f50cb3e58
fix: Supplier trigger onload
2020-09-15 15:00:32 +05:30
Anupam Kumar
699e853009
Merge branch 'develop' into sales-analytics
2020-09-15 13:24:02 +05:30
Anurag Mishra
9397b7f58b
fix: requested changes
2020-09-15 12:36:01 +05:30
Anupam
bae2d5d485
fix: review changes
2020-09-15 12:12:31 +05:30
marination
665c27af58
fix: Merge conflict missing line
2020-09-15 12:04:38 +05:30
Marica
baedc627ee
Merge branch 'develop' into item-tax-update-items
2020-09-15 11:30:22 +05:30
marination
4bb8d0c193
chore: Test for PO
2020-09-15 11:18:02 +05:30
Saqib
61314248bb
feat: uom in update items for SO & PO ( #22869 )
...
* feat: uom in update items for SO & PO
* fix: supplied items doesn't updates on uom change
* chore: add uom and conv factor change test
* fix: test
* fix: purchase order updates are not tracked
* fix: fetch conversion factor on uom change
* fix: codacy
Co-authored-by: Marica <maricadsouza221197@gmail.com>
2020-09-15 11:14:31 +05:30
Marica
65c2c4f85f
Merge branch 'develop' into item-tax-update-items
2020-09-15 09:49:06 +05:30
Deepesh Garg
36bc0577a2
fix: Item GL entries for purchase invoice ( #23027 )
2020-09-15 09:44:46 +05:30
marination
b7cd84196d
fix: Revert tax calculation changes
2020-09-15 09:42:51 +05:30
Anupam Kumar
8cb356bf30
Merge branch 'develop' into sales-analytics
2020-09-14 11:21:58 -07:00
Rucha Mahabal
fcb6ba6ec7
fix: get_transaction_entries function arguments in Bank Statement Transaction Entry ( #23051 )
2020-09-14 21:12:36 +05:30
Saqib
6db92fbb6a
feat: validate workflow before so/po update items ( #23024 )
...
* feat: validate workflow before so/po update items
* fix: incorrect workflow validation on so/po update items
Co-authored-by: Marica <maricadsouza221197@gmail.com>
2020-09-14 19:54:17 +05:30
Deepesh Garg
93d7c2f1da
Merge pull request #23283 from ruchamahabal/fix-student-email-id
...
fix: Set student email id mandatory only if skip user creation is disabled
2020-09-14 19:34:10 +05:30
Rucha Mahabal
1751929a55
Merge pull request #22853 from ruchamahabal/refactor-lab-module
...
refactor: Laboratory Module
2020-09-14 16:32:51 +05:30
Rucha Mahabal
026cf2d3cc
Merge branch 'develop' into refactor-lab-module
2020-09-14 14:45:19 +05:30
Marica
59d20c7d2c
Merge pull request #23315 from marination/pr-dn-get-items
...
fix: Make sure Supplier/Customer is selected before fetching Items(ux)
2020-09-14 11:35:02 +05:30
Marica
c4a8c9eb26
Merge branch 'develop' into pr-dn-get-items
2020-09-14 11:09:32 +05:30
rohitwaghchaure
7fc629b71a
Merge pull request #23316 from marination/quality-inspection-fields
...
fix: Make Reference fields mandatory in Quality Inspection (ux)
2020-09-13 18:12:05 +05:30
marination
9205101ecf
fix: Make Reference fields mandatory in Quality Inspection
2020-09-12 16:17:13 +05:30
marination
0a688005be
fix: Make sure Supplier/Customer is selected before fetching Items.
2020-09-12 15:39:27 +05:30
barredterra
16f1435d63
fix: codacy
2020-09-11 18:57:58 +02:00
barredterra
41978ac882
Merge branch 'develop' into datev_refactor
2020-09-11 17:54:50 +02:00
Anupam K
ed08e593c3
feat: added project in Sales Analytics report
2020-09-11 14:03:31 +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
Rucha Mahabal
a29436dc91
fix: codacy
2020-09-10 17:45:17 +05:30
Rucha Mahabal
c0f9d1b65a
test: Lab Module
2020-09-10 17:33:52 +05:30
Rucha Mahabal
42bff3289d
Merge branch 'develop' into refactor-lab-module
2020-09-10 12:36:29 +05:30
Rucha Mahabal
2388199347
Merge branch 'develop' into fix-student-email-id
2020-09-10 12:16:16 +05:30
Rucha Mahabal
1915a60834
fix: education settings check
2020-09-10 12:13:58 +05:30
Saqib
ec6a97fb6a
fix: cannot delete pos page if linked with desk page ( #22993 )
...
* fix: cannot delete pos page if linked with desk page
* fix: replace pos page links with point-of-sale page
Co-authored-by: gavin <gavin18d@gmail.com>
2020-09-09 10:54:14 +05:30
Deepesh Garg
dc84633860
Merge pull request #23301 from deepeshgarg007/closed_loan_amount
...
fix: Amount for closed loans
2020-09-08 21:32:54 +05:30
Deepesh Garg
846e6d4803
fix: Add test
2020-09-08 21:32:06 +05:30
Deepesh Garg
f247686ace
fix: Amount for closed states
2020-09-08 21:26:06 +05:30
Saqib
8f43cf2c9a
fix: asset movement date for backdated asset entry ( #23298 )
2020-09-08 17:44:47 +05:30
rohitwaghchaure
93dccd2eaa
Merge pull request #23132 from anupamvs/item-group-filter-portal
...
fix: [Portal] added filter show in website
2020-09-08 17:03:54 +05:30
rohitwaghchaure
1d555f35a7
Merge pull request #23282 from deepeshgarg007/tds_bug
...
fix: Apply TDS on Purchase Invoice creation from Purchase Order and Purchase Receipt
2020-09-08 16:59:29 +05:30
