Commit Graph

25701 Commits

Author SHA1 Message Date
rohitwaghchaure
4904ce649e
Merge pull request #16952 from rohitwaghchaure/fixed_accounts_receivable_summary_advance_amt
fix: advance amount is not calculating properly
2019-03-19 15:26:41 +05:30
Rohit Waghchaure
1a6e01542a fix: advance amount is not calculating properly 2019-03-19 15:06:01 +05:30
rohitwaghchaure
51eec69164
Merge pull request #16948 from rohitwaghchaure/v12_new_pricing_rule_feat
feat: pricing rule enhancements
2019-03-19 14:39:18 +05:30
Rohit Waghchaure
8bfe330b37 feat: pricing rule enhancements 2019-03-19 12:44:30 +05:30
Faris Ansari
5f8b358fd4
Website: Product Configurator and Bootstrap 4 (#15965)
- Refactored Homepage with customisable Hero Section
- New Homepage Section to add content on Homepage as cards or using Custom HTML
- Products page at "/all-products" with customisable filters
- Item Configure dialog to find an Item Variant filtered by attribute values
- Contact Us dialog on Item page
- Customisable Item page content using the Website Content field
2019-03-19 11:48:32 +05:30
Rushabh Mehta
1e7d768a45
Merge pull request #16951 from hrwX/change-to-supplier
fix(Supplier Ledger Summary): Change Customer to Supplier in Supplier Ledger Summary
2019-03-19 09:47:14 +05:30
Himanshu Warekar
642a5b69f5 fix: change customer to supplier 2019-03-18 21:53:33 +05:30
Rushabh Mehta
f060831cce fix(escaping): make_italian_localization_fields.py 2019-03-18 18:04:34 +05:30
rohitwaghchaure
2a4d4036f6
Merge pull request #16946 from rohitwaghchaure/minor_fix_debug
code cleanup
2019-03-18 17:01:23 +05:30
Rohit Waghchaure
5b43e2f31a code cleanup 2019-03-18 17:00:44 +05:30
rohitwaghchaure
2046024de9
Merge pull request #16942 from hrwX/invoice-creation-tool
fix(Invoice Creation Tool): Disable P/L validation for opening invoice creation
2019-03-18 15:48:55 +05:30
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
rohitwaghchaure
ac9f38bfc2
Merge pull request #16940 from rohitwaghchaure/added_cost_center_filters_in_ar_ap
feat: added cost center filter in AR/AP reports
2019-03-18 14:22:15 +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
Himanshu Warekar
aa03ea2a56 disbale pl check for Sales and Purchase Invoice 2019-03-18 12:36:42 +05:30
Rohit Waghchaure
ace95d5a67 feat: added cost center filter in AR/AP reports 2019-03-18 12:21:00 +05:30
Suraj Shetty
4713e2dd73
Merge pull request #16929 from Mangesh-Khairnar/email-address-fix
refactor: change validate email add to validate email address
2019-03-18 11:26:14 +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
Mangesh-Khairnar
b343407236 refactor: change validate email add to validate email address 2019-03-16 13:40:58 +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
Rushabh Mehta
349a1157ef
Merge pull request #16717 from jigartarpara/fix_payment_term_template
fix: Add credit month in validation
2019-03-15 09:03:54 +05:30
Rushabh Mehta
b7abdf1222
Merge pull request #16851 from JoyceBabu/develop
fix: Add 'Half-Yearly' option to Earned Leave Frequency
2019-03-15 09:02:43 +05:30
Rushabh Mehta
957a3307ae
Merge pull request #16634 from Alchez/hotfix-stock-balance-balance
fix(stock_balance): Make balance qty and value columns more visible in the Stock Balance report
2019-03-15 09:02:20 +05:30
Rushabh Mehta
59a3012a5c
Update payment_request.py 2019-03-15 08:57:49 +05:30
Rushabh Mehta
e5d79f3621
Merge pull request #16673 from Alchez/feat-task-from-issue
feat(issue): Create and view Tasks from Issues
2019-03-15 08:55:20 +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
2352ce92cc
Merge pull request #16849 from frappe/bcornwellmott-patch-1
fix: Add date to currency exchange caching
2019-03-14 14:18:09 +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
Rushabh Mehta
bd9622bfd5
Merge pull request #16918 from Alchez/hotfix-party-payments
fix(transaction): Add link to payments made by Customer / Supplier in their dashboards
2019-03-14 14:14:42 +05:30
Rohan Bansal
82433845e5 fix(transaction): Add link to payments made by Customer / Supplier in their dashboards 2019-03-14 13:18:55 +05:30
Rushabh Mehta
f49d0d8058
Merge pull request #16890 from Anurag810/timesheet
feat: Timesheet Reports
2019-03-14 10:31:23 +05:30
Rushabh Mehta
6e2286f5f0
Merge pull request #16897 from PawanMeh/fixes_16894
fixes: Amazon v12 integration issues
2019-03-14 10:30:29 +05:30