Makarand Bauskar
960208bae0
Merge pull request #9426 from tundebabzy/issue-9096
...
Gross Profit Does not display Reversal of sales invoice #9096
2017-07-03 15:23:21 +05:30
Rushabh Mehta
43ef4e9047
Added first UI tests ( #9532 )
...
* [wip]
* [tests] wip
* [ui-tests] first-cut
* [minor] remove old tests
2017-07-03 11:53:07 +05:30
mbauskar
a06a600d0a
Merge branch 'master' into develop
2017-07-01 14:16:46 +05:30
Makarand Bauskar
1589ada04d
Merge pull request #9473 from rohitwaghchaure/pricing_rule_currency
...
[enhance] Provision to set the currency in the pricing rule for the price
2017-06-30 18:58:30 +05:30
Charles-Henri Decultot
53de2f1b57
Translation correction in P&L report ( #9436 )
2017-06-30 16:45:11 +05:30
mbauskar
22aaf0cbd0
[minor] fixed AttributeError: 'dict' object has no attribute 'company' in sales register
2017-06-30 16:43:25 +05:30
Rohit Waghchaure
b801357ecf
[minor] Total amount not showing value in bank reconcillation
2017-06-29 18:40:01 +05:30
rohitwaghchaure
4b33b7e1c1
Merge pull request #9418 from nick9822/nick9822-patch-3
...
Removed "Asset" filter on payment account
2017-06-28 16:38:21 +05:30
Rushabh Mehta
f4e908bd91
[minor] general_ledger.js
2017-06-27 11:56:30 +05:30
Makarand Bauskar
5d8803b23e
Merge pull request #9435 from rmehta/gst
...
GST (India) Setup and Invoices #8711
2017-06-27 11:44:33 +05:30
Rohit Waghchaure
0b078fb4cb
[enhance] Provision to set the currency in the pricing rule for the price
2017-06-27 00:06:40 +05:30
tunde
67cbeb1bb0
Merge branch 'develop' into issue-9096
2017-06-26 12:11:07 +01:00
nick9822
82e816054e
Added report_type to payment account filter
2017-06-26 15:29:44 +05:30
rohitwaghchaure
8f51a5e527
In POS on click of delete button, remove the selected item from the cart ( #9428 )
2017-06-23 18:17:04 +05:30
Makarand Bauskar
4eced4acec
Merge pull request #9445 from rohitwaghchaure/column_width_issue_bank_reco
...
[minor] Fix grid column of the Bank Reconciliation
2017-06-23 17:24:50 +05:30
Rohit Waghchaure
8326028d33
Don't validate delivery note and sales order required for the POS invoice
2017-06-23 12:56:12 +05:30
Rohit Waghchaure
666d004b40
[minor] Fix grid column of the Bank Reconciliation
2017-06-23 12:10:21 +05:30
Rushabh Mehta
919a74ad88
[gst] adde reports + docs
2017-06-22 22:32:08 +05:30
Rushabh Mehta
b3c8f44b3e
[wip] GST for India. Pending reports
2017-06-22 22:31:32 +05:30
mbauskar
66e2a510b9
[minor] deleted deprecated reprots and changed the lead.json modified time
2017-06-22 16:57:46 +05:30
tunde
96e629a635
adds credits notes to report since double entry for P or L affects sales
2017-06-22 10:04:33 +01:00
Makarand Bauskar
e995371b08
Merge pull request #9355 from rohitwaghchaure/company_wise_manufacturing_settings
...
[Enhance] Company wise perpetual inventory settings
2017-06-22 12:35:41 +05:30
nick9822
881491cd2b
Removed "Asset" filter on payment account
2017-06-21 19:51:08 +05:30
Vishal Dhayagude
310d4dc9e0
UOM column in Batch Wise Balance History Report ( #9359 )
...
* Training Events/Results link to employee dashbord
* [minor]Improve validation message for Buying / Selling Setting
* [minor]Added UOM cloumn in Batch Wise Balance History Report
* modified validation message for buying / selling setting
2017-06-20 13:02:35 +05:30
Rohit Waghchaure
e9ff1914fc
Added is_perpetual_inventory_enabled method
2017-06-20 11:26:37 +05:30
Rohit Waghchaure
6945d0dd8a
fixed test cases
2017-06-20 10:21:33 +05:30
Rohit Waghchaure
a5f40941ae
[Enhance] Companywise perpetual inventory setting
2017-06-20 10:21:33 +05:30
Charles-Henri Decultot
2305eda82e
Addition of new fields for POS Profile in Sales Invoice and POS Profile User link modification ( #9339 )
2017-06-19 09:25:54 +05:30
Sagar Vora
5f407907a2
fix logic of quantity validation ( #9311 )
2017-06-16 11:43:36 +05:30
mbauskar
f9e2bf1ab4
fixed merge conflicts
2017-06-15 13:42:47 +05:30
Nabin Hait
6e9a146f2b
Merge pull request #9193 from tundebabzy/issue_9180
...
Payment Entry - Latest Exchange Rate not fetched
2017-06-15 12:34:27 +05:30
Makarand Bauskar
428e5b7172
Merge pull request #9299 from rohitwaghchaure/refernce_name_issue
...
[fix] Payment Entry - draft sales invoices should not be selectable
2017-06-15 12:32:00 +05:30
Nabin Hait
2153399c39
Create journal_entry.py
2017-06-15 12:30:58 +05:30
Rohit Waghchaure
5ea8c97b7c
[fix] Payment Entry - draft sales invoices should not be selectable
2017-06-15 12:16:15 +05:30
Nabin Hait
6d7b0ce794
Warehouse Account Linking ( #9292 )
...
* [enhance] Added account in the warehouse
* documentation
* patch to move account head from account to warehouse
* fixed test cases
* Fixes in warehouse-account linking
* minor fix in test case
2017-06-15 11:09:27 +05:30
rohitwaghchaure
03ba66d0d8
[Fix] In sales invoice, delivery note link not showing in the dashboard if delivery note has made from sales invoice ( #9290 )
2017-06-14 19:41:11 +05:30
tunde
3514332cd8
changes journal_entry.get_exchange_rate to return exchange rate at date not average exchange rate
2017-06-14 13:14:40 +01:00
tundebabzy
f5604c101c
Once primary key is generated, do not allow changing Series #8911 ( #9265 )
...
* changes set_only_once field for tabDocField to 1
* changes all affected doctypes `set_only_once` option to 1
* add patch name to text file
* adds test cases
* Revert "add patch name to text file"
This reverts commit fc7cb6b4557217cee61abfbbf42ff6f40099f23c.
* Revert "changes set_only_once field for tabDocField to 1"
This reverts commit 2b1f7f31a0d6491056d809f319bae0f7b84be435.
2017-06-14 16:10:09 +05:30
tundebabzy
5c9dd42547
fixes #9098 : don't skip calculation if income or expense is [] ( #9267 )
2017-06-14 14:57:34 +05:30
rohitwaghchaure
4c0f9dac94
Total amount not showing for credit note column in the print ( #9278 )
2017-06-14 12:54:48 +05:30
Makarand Bauskar
0da5f23db6
[minor] fixed Cannot read property 'default_letter_head' of undefined ( #9268 )
2017-06-14 12:52:13 +05:30
rohitwaghchaure
1b2b4a626f
[Fix] Accounts receivable report showing wrong currency for total amount against the customer ( #9276 )
2017-06-14 12:32:52 +05:30
KanchanChauhan
1dc26b127b
Salutation and Gender in Lead and Customer ( #9199 )
2017-06-13 15:26:35 +05:30
Saurabh
797f2030f8
Merge branch 'master' into develop
2017-06-13 15:20:13 +05:30
Ashwini Save
7f14f28099
Account Receivable - Credit Note column added to print format. ( #9230 )
...
* Account Receivable - Credit Note column added to print Format.
* Review changes for translation: Account Receivable add credit note column
* Review changes for translation: Account Receivable add credit note column
* Review changes for translation: Account Receivable add credit note column
2017-06-13 11:18:39 +05:30
Nabin Hait
d0ac0bdc18
Merge branch 'master' into develop
2017-06-12 13:50:12 +05:30
Rohit Waghchaure
782d477be0
[fix] Due Date cannot be before Posting Date
2017-06-12 12:35:40 +05:30
Rohit Waghchaure
c8490626f9
[minor] added mobile no to search customer in POS
2017-06-10 12:21:37 +05:30
tunde
5127da952e
changes expected payment_account in test case according to the fact that exchange rate should return latest saved rate
2017-06-09 17:11:41 +01:00
tunde
7bf4b121f3
Merge branch 'hotfix' into issue_9180
2017-06-09 13:58:22 +01:00
