Himanshu
|
ac199580af
|
fix(Customer Ledger): ambiguous error in where clause (#16914)
fix for error "InternalError: (1052, u"Column 'company' in where clause is ambiguous")" in Customer Ledger Summary
|
2019-03-18 15:44:54 +05:30 |
|
rohitwaghchaure
|
4c8627e88d
|
Merge pull request #16523 from Zlash65/comp-sync
feat: Sync Chart of Accounts in Company hierarchy
|
2019-03-18 15:43:50 +05:30 |
|
Rohit Waghchaure
|
d4e4316d0b
|
fix: test cases and codacy
|
2019-03-18 14:18:49 +05:30 |
|
Zlash65
|
01086ff60c
|
codacy fixes
|
2019-03-18 12:50:29 +05:30 |
|
Zlash65
|
11bba571af
|
test case added to check account syncing
|
2019-03-18 12:50:29 +05:30 |
|
Zlash65
|
cc65447e62
|
fix: chart of accounts field toggling improv
|
2019-03-18 12:50:29 +05:30 |
|
Zlash65
|
f71cb8dc6d
|
fix: return if no descendants found
|
2019-03-18 12:50:28 +05:30 |
|
Zlash65
|
73acb8c837
|
fix: set chart of accounts based on parent company on server side
|
2019-03-18 12:50:28 +05:30 |
|
Zlash65
|
d787ef8b8e
|
feat: sync account created for a group company to all its descendants
|
2019-03-18 12:50:28 +05:30 |
|
Zlash65
|
88c990901d
|
fix: added validation to if account is being added to child company
|
2019-03-18 12:50:28 +05:30 |
|
Zlash65
|
0407bf1e00
|
fix: override primary action button, change filter to root company
|
2019-03-18 12:50:27 +05:30 |
|
Zlash65
|
2def228da8
|
feat: allow adding account only if topmost parent company
- hidden filter for Parent Company added
- Add button overriden with new condition
|
2019-03-18 12:50:27 +05:30 |
|
Zlash65
|
a57d58f756
|
feat: once company is saved, parent_company cannot be selected
|
2019-03-18 12:50:27 +05:30 |
|
Zlash65
|
1a4bfdd090
|
feat: selecting parent_company should disable chart_of_accounts based fields
|
2019-03-18 12:50:27 +05:30 |
|
Deepesh Garg
|
3ead70ba3c
|
fix: Change IBAN Account length from 25 to 30 (#16847)
|
2019-03-18 08:22:57 +05:30 |
|
Deepesh Garg
|
2ae7ed4cf0
|
fix: Gross profit report fix (#16935)
|
2019-03-17 09:49:24 +05:30 |
|
rohitwaghchaure
|
fd33c55760
|
Merge pull request #16865 from rohitwaghchaure/purchase_invoice_asset_issue_not_able_to_submit
feat: added provision to disable CWIP accounting in asset settings
|
2019-03-16 12:18:36 +05:30 |
|
rushin29
|
08a209bc52
|
fix: gst_state_number for address with Unregistered GST (#16798)
|
2019-03-15 15:28:50 +05:30 |
|
rohitwaghchaure
|
ef74e94374
|
Merge pull request #16882 from rohitwaghchaure/multiple_time_logs_in_job_card
feat: child table to add multiple time logs in job card
|
2019-03-15 11:46:33 +05:30 |
|
Bassam Ramadan
|
e14758c897
|
fix: add returns field to cashier closing (#16911)
|
2019-03-14 15:01:50 +05:30 |
|
Rushabh Mehta
|
947d573276
|
Merge pull request #16892 from hrwX/uae_fix
fix(UAE): Fetch from fix for UAE customizations
|
2019-03-14 14:20:32 +05:30 |
|
Rushabh Mehta
|
e8258fc352
|
Merge pull request #16854 from jay-parikh/hotfix
fix: Default Company to Total Stock Summary Report
|
2019-03-14 14:18:36 +05:30 |
|
Rushabh Mehta
|
d63e0f490c
|
Merge pull request #16856 from hrwX/sales-work-fix
fix(Work Order): fetch item info when making work order from sales order
|
2019-03-14 14:17:40 +05:30 |
|
Rushabh Mehta
|
20af5a2b40
|
Merge pull request #16866 from deepeshgarg007/additional
fix: Removed relieving date validation form additional salary
|
2019-03-14 14:16:18 +05:30 |
|
Rohit Waghchaure
|
52729bf369
|
feat: child table to add multiple time logs in job card
|
2019-03-11 00:02:32 +05:30 |
|
Himanshu Warekar
|
1692fbaf1c
|
fetch from fix
|
2019-03-08 18:37:34 +05:30 |
|
Frappe Bot
|
2ae018a653
|
Merge branch 'hotfix'
|
2019-03-08 09:39:33 +00:00 |
|
Frappe Bot
|
3406229152
|
bumped to version 11.1.14
|
2019-03-08 09:39:32 +00:00 |
|
Rohit Waghchaure
|
821a002125
|
feat: added provision to disable CWIP accounting in asset settings
|
2019-03-08 10:51:37 +05:30 |
|
Nabin Hait
|
9ec4816b32
|
Update item_barcode_childtable_migrate.py
|
2019-03-08 10:44:13 +05:30 |
|
deepeshgarg007
|
78a32ae172
|
fix: Remove validation for relieving date from additional salary
|
2019-03-07 20:00:07 +05:30 |
|
rohitwaghchaure
|
d4754619d0
|
Merge pull request #16806 from rohitwaghchaure/set_scanned_barcode_in_the_table
fix: scan barcode not adding the barcode value in the items table
|
2019-03-07 11:29:56 +05:30 |
|
rohitwaghchaure
|
d06212e408
|
Merge pull request #16853 from rohitwaghchaure/pos_profile_changes
fix: POS profile, account for change amount must be cash or bank account
|
2019-03-07 11:28:25 +05:30 |
|
Himanshu Warekar
|
7ab961f798
|
remove debug code
|
2019-03-06 23:53:38 +05:30 |
|
Himanshu Warekar
|
59699bf46e
|
[debug] locally tests passed but travis failed
|
2019-03-06 23:33:03 +05:30 |
|
Himanshu Warekar
|
4f1737c2dd
|
fix sales order test for creating work order from sales order
|
2019-03-06 22:19:15 +05:30 |
|
Himanshu Warekar
|
783331c645
|
sales_order to work_order item desc fix
|
2019-03-06 18:44:04 +05:30 |
|
Rohit Waghchaure
|
db8500c03a
|
POS profile, account for change amount must be cash or bank account
|
2019-03-06 18:28:45 +05:30 |
|
Jay Parikh
|
9757a603fa
|
Fix Company Default to Total Stock Summary Report
|
2019-03-06 12:44:41 +00:00 |
|
Rushabh Mehta
|
29c46bb311
|
fix(sales_order.py): handle zero bundle qty
|
2019-03-06 14:49:13 +05:30 |
|
Prateeksha Singh
|
fb491a568f
|
Merge pull request #16842 from hrwX/additional_salary
fix(Additional Salary): Allow additional salary to be zero
|
2019-03-05 17:34:37 +05:30 |
|
Himanshu Warekar
|
acb7238ad6
|
Allow zero amount in additional salary
|
2019-03-05 12:20:19 +05:30 |
|
Rushabh Mehta
|
1f0792d5ea
|
Merge pull request #16823 from jay-parikh/sales-return
fix: Python 3 Sales Invoice Return Validation "validate_pos"
|
2019-03-05 08:05:00 +05:30 |
|
rohitwaghchaure
|
55c382a780
|
Merge pull request #16820 from rohitwaghchaure/state_code_blank_if_not_matched_with_state_codes
fix: on save of the address, state code field become blank
|
2019-03-04 16:59:45 +05:30 |
|
rohitwaghchaure
|
f6a8b17717
|
Merge pull request #16824 from rohitwaghchaure/user_not_able_to_search_item_by_description
fix(sales order item): not able to search item by description
|
2019-03-04 16:59:19 +05:30 |
|
rohitwaghchaure
|
369d20ac2b
|
Merge pull request #16829 from rohitwaghchaure/gst_purchase_invoice_hsn_number
fix: HSN code not disaplying for the GST Purchase Invoice print format
|
2019-03-04 16:58:58 +05:30 |
|
rohitwaghchaure
|
e552170ce6
|
Merge pull request #16704 from Anurag810/vedmata-print-formats
feat: Auditors print formats
|
2019-03-04 16:58:31 +05:30 |
|
rohitwaghchaure
|
8c96e06e19
|
Merge pull request #16629 from Anurag810/gross-and-net-profit-report
feat: Gross and Net Profit Report
|
2019-03-04 16:57:21 +05:30 |
|
Anurag Mishra
|
0c9945e0bf
|
Minor fixes
|
2019-03-04 16:14:53 +05:30 |
|
Anurag Mishra
|
02138b6bfc
|
fix: gross depends upon now report type
|
2019-03-04 14:46:28 +05:30 |
|