Marica
|
3b2da41f84
|
Merge branch 'develop' into debit-credit-opening-invoice-tool
|
2020-12-05 17:04:26 +05:30 |
|
Anuja P
|
2e4faf96f2
|
fix: Added TDS Payable account number and an error message
|
2020-12-05 13:36:43 +05:30 |
|
Deepesh Garg
|
eb951f3996
|
Merge pull request #24060 from deepeshgarg007/template_update
fix(India): Tax template update on supplier change
|
2020-12-05 12:38:10 +05:30 |
|
Marica
|
067f35df26
|
Merge branch 'develop' into debit-credit-opening-invoice-tool
|
2020-12-04 21:13:23 +05:30 |
|
marination
|
c866abca56
|
fix: (travis) Disable update stock for deferred accounting item's Sales Invoice
|
2020-12-04 20:12:52 +05:30 |
|
Anurag Mishra
|
26b3328af7
|
fix: leave policy assignment patch (#24061)
|
2020-12-04 19:50:24 +05:30 |
|
Deepesh Garg
|
a767085276
|
fix: Tax template update on supplier
|
2020-12-04 18:07:46 +05:30 |
|
Marica
|
ab510d2417
|
Merge pull request #23429 from marination/link-to-mr
feat: (RFQ/SQ) Link to Material Requests in Tools section
|
2020-12-04 17:58:17 +05:30 |
|
Marica
|
afc517b8bf
|
Merge branch 'develop' into link-to-mr
|
2020-12-04 16:30:40 +05:30 |
|
Marica
|
c1885046d3
|
Merge pull request #24051 from Anuja-pawar/issue_customer_filter
feat(Issue): Added filter for customer field
|
2020-12-04 16:21:16 +05:30 |
|
Anuja Pawar
|
8a8a91c6b9
|
Merge branch 'develop' into issue_customer_filter
|
2020-12-04 15:26:40 +05:30 |
|
Anuja P
|
2e48cf7308
|
Merge branch 'issue_customer_filter' of https://github.com/Anuja-pawar/erpnext into issue_customer_filter
Merge branch 'issue_customer_filter' of https://github.com/Anuja-pawar/erpnext into issue_customer_filter
|
2020-12-04 15:19:06 +05:30 |
|
Kenneth Sequeira
|
c4eb41c92b
|
fix; styling for sider
|
2020-12-04 15:00:22 +05:30 |
|
Anuja P
|
931f2e73a7
|
fix: sider changes
|
2020-12-04 14:57:23 +05:30 |
|
rohitwaghchaure
|
c4d9bb21d1
|
Merge pull request #24053 from rohitwaghchaure/additional-product-incorrect-rate
fix: pricing rule with transaction not working for additional product
|
2020-12-04 14:14:55 +05:30 |
|
Anuja Pawar
|
84166a931e
|
Merge branch 'develop' into issue_customer_filter
|
2020-12-04 13:33:18 +05:30 |
|
marination
|
6a2431586e
|
fix: Make new Customers for account missing test and set company
|
2020-12-04 13:31:36 +05:30 |
|
Rucha Mahabal
|
edee530d4c
|
fix: paid amount in Sales Invoice POS return resets to 0
|
2020-12-04 12:13:26 +05:30 |
|
Rohit Waghchaure
|
28e86cf183
|
fix: pricing rule with transaction not working for additional product
|
2020-12-04 11:57:56 +05:30 |
|
Anuja P
|
0139109de2
|
fix: consistency check
|
2020-12-04 11:28:13 +05:30 |
|
Marica
|
4bf951a85b
|
Merge branch 'develop' into v13-patch-fixes-1
|
2020-12-03 19:55:03 +05:30 |
|
Anuja P
|
25e058833a
|
fix: sider changes
|
2020-12-03 18:13:24 +05:30 |
|
Anuja P
|
26cc662a78
|
feat: added filter for customer field
|
2020-12-03 17:45:34 +05:30 |
|
Abhishek Balam
|
a31731e73d
|
Merge pull request #24050 from Anuja-pawar/fiscal_year_filter_fix
refactor(Fiscal Year): to avoid using SQL query to get fiscal year filters
|
2020-12-03 17:37:29 +05:30 |
|
Anuja P
|
69c5d49b25
|
refactor: to avoid using SQL query to get fiscal year filters
|
2020-12-03 15:14:54 +05:30 |
|
rohitwaghchaure
|
f851eed7b4
|
Merge pull request #24048 from rohitwaghchaure/fixed-incorrect-balance-value-in-stock-balance-develop
fix: incorrect balance value in stock balance report
|
2020-12-03 13:45:07 +05:30 |
|
Rohit Waghchaure
|
8474476316
|
fix: incorrect balance value in stock balance report
|
2020-12-03 13:43:11 +05:30 |
|
Kenneth Sequeira
|
131e46bab7
|
chore: add help section for Jinja
|
2020-12-02 21:37:55 +05:30 |
|
Kenneth Sequeira
|
9abc685504
|
feat: add jinja templating in contract template
|
2020-12-02 21:13:50 +05:30 |
|
Marica
|
376c1eaa48
|
Merge pull request #22914 from newmatik/shipment_with_integration
feat: Shipment Doctype
|
2020-12-02 17:37:41 +05:30 |
|
Joshua Angelo Bienes
|
324622bd2a
|
Merge branch 'develop' into shipment_with_integration
|
2020-12-02 19:21:32 +08:00 |
|
Marica
|
cf44f1c9d3
|
Merge pull request #24044 from marination/gross-pay-based-on-present-days-test
fix: Test Payment Based on Leave Application (Travis)
|
2020-12-02 16:42:47 +05:30 |
|
marination
|
523c464a92
|
fix: Test Payment Based on Leave Application (Travis)
|
2020-12-02 16:01:35 +05:30 |
|
jbienesdev
|
8e68f128c1
|
fix: travis build error
- Removed shipment notification and subscription files
- Minor changes on shipment field configuration
- Add shipment to desk
|
2020-12-02 08:56:49 +00:00 |
|
jbienesdev
|
b4b542d1c3
|
chore: linter issues and sider checks
|
2020-12-02 07:15:16 +00:00 |
|
jbienesdev
|
99361b4a9e
|
chore: remove notification details section
|
2020-12-02 07:15:14 +00:00 |
|
jbienesdev
|
28055f483d
|
fix(shipment): change shipment test and refactor shipment.js
|
2020-12-02 07:15:13 +00:00 |
|
jbienesdev
|
ac3c1f1493
|
chore: remove packlink, letmeship, and sendcloud files
|
2020-12-02 07:15:11 +00:00 |
|
jbienesdev
|
000494f548
|
fix(shipment): apply code review
|
2020-12-02 07:15:05 +00:00 |
|
jbienesdev
|
1c9410e5e8
|
feat(shipment): Shipment Doctype with Integrations
|
2020-12-02 07:14:58 +00:00 |
|
Deepesh Garg
|
d8aeaed6ab
|
Merge pull request #24039 from rohitwaghchaure/fixed-incorrect-gstr-report-issue
fix: GSTR B2C report
|
2020-12-01 20:44:33 +05:30 |
|
Saurabh
|
2e27f074c3
|
feat: reload doctype number card link
|
2020-12-01 18:08:04 +05:30 |
|
Rohit Waghchaure
|
1ac040a418
|
fix: GSTR report
|
2020-12-01 13:50:01 +05:30 |
|
Anurag Mishra
|
0fb05d1ba4
|
Merge pull request #24038 from Anurag810/bom-fix
fix: keyerror 'sourced_by_supplier'
|
2020-12-01 13:47:06 +05:30 |
|
Anurag Mishra
|
0e9eb95b22
|
Merge branch 'develop' into bom-fix
|
2020-12-01 13:18:00 +05:30 |
|
Leela vadlamudi
|
a3845a95ed
|
feat: Introducing telephony module (#24032)
|
2020-12-01 13:04:53 +05:30 |
|
Nabin Hait
|
029b9c08dd
|
Update bom.py
|
2020-12-01 09:33:17 +05:30 |
|
Suraj Shetty
|
ad57eef40c
|
fix(product-listing): Check if customer exists (#24030)
- It might happen that perty_name might not always be Customer
(it might be Supplier as well)
|
2020-12-01 09:14:57 +05:30 |
|
Afshan
|
ccf5dc66e2
|
feat: multi-currency payroll (#23519)
* feat: multi-currency payroll
* fix: refactor and added conditions
* fix: uncommented code
* style: removed comments
* fix: missing argument
* style: styling changes
* fix: test cases
* Update asset_value_adjustment.py
* patch: update columns
* style: formating
* style: formatting
* fix: 1st review
* fix: refactor
* Revert "fix: refactor"
This reverts commit eca0e17d11a192d60f249b2af992971c625aec46.
reverting to previous state
* Revert "fix: 1st review"
This reverts commit 7eac48b102157df4353598f73b2ea97308af436a.
reverting before 1st review
* fix: 2nd review changes
* fix: test cases
* fix: added call to fetch exchange rate
* fix: remove unnecessary code
* fix: refactor
* fix: refactor patch
* fix: refactor
* fix: refactor
* fix: clear test data
* fix: slider
* feat: multi-currency payroll
* fix: refactor and added conditions
* fix: uncommented code
* style: removed comments
* fix: missing argument
* style: styling changes
* fix: test cases
* patch: update columns
* Update asset_value_adjustment.py
* style: formating
* style: formatting
* fix: 1st review
* fix: refactor
* Revert "fix: refactor"
This reverts commit eca0e17d11a192d60f249b2af992971c625aec46.
reverting to previous state
* Revert "fix: 1st review"
This reverts commit 7eac48b102157df4353598f73b2ea97308af436a.
reverting before 1st review
* fix: 2nd review changes
* fix: test cases
* fix: added call to fetch exchange rate
* fix: remove unnecessary code
* fix: refactor
* fix: refactor patch
* fix: refactor
* fix: refactor
* fix: clear test data
* fix: slider
* feat: Added company field in leave encashment and employee benefit
* refactor: Refactored multi-currency payroll patch
* fix: currency column in salary register
* refactor: Refactored code for making bank and return entry against employee advance
* fix: minor cleanup
* fix: fixed translation
* fix: removed salary component type
* fix: fixed sider issues
* fix: translation and slider
* style: formatted msg
* fix: fixed slider
* fix: travis
* fix: refactor
* fix: slider
* fix: slider
* fix: slider
* fix: travis
* fix: patch
* fix: patch
* fix: travis
* fix: travis
* fix: travis
* fix: travis
* fix: travis
* fix: travis
* fix: re-run travis
* fix: rerun travis
* fix: rerun travis
* fix: rerun travis
* fix: travis rerun
* fix: increased throttle_user_limit from 60 to 100
* fix: patch
* fix: patch
* fix: assign payroll payable account as default payroll payable account in SSA
* fix: removed debugger
* fix: slider
Co-authored-by: Anurag Mishra <32095923+Anurag810@users.noreply.github.com>
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
|
2020-12-01 09:11:05 +05:30 |
|
Anurag Mishra
|
66e8a12d0f
|
fix: KeyError 'sourced_by_supplier'
|
2020-11-30 17:53:28 +05:30 |
|