Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
21,283 Commits 3 Branches 0 Tags 1 GiB
5e93b02c85
Commit Graph

3365 Commits

Author SHA1 Message Date
mbauskar
4ef1e2046b Merge branch 'master' into staging 2017-08-04 14:08:57 +05:30
mbauskar
e770824568 Merge branch 'master' into develop 2017-08-04 14:08:57 +05:30
Rohit Waghchaure
499144fd86 Fixed test cases for dynamic link order 2017-08-04 13:30:59 +05:30
mbauskar
cce79255fe resolved merge conflicts 2017-08-04 11:07:49 +05:30
mbauskar
f3be738b68 resolved merge conflicts 2017-08-04 11:07:07 +05:30
rohitwaghchaure
0c1d441aa3 Test case for dynamic link order (#10276) 2017-08-04 10:55:46 +05:30
rohitwaghchaure
5906ddf804 [Fix] View ledger button not disaplying in the head of an account (#10254) 
* [Fix] View ledger button not disaplying in the head of an account

* Show view ledger button in account if user has permission to read GL Entry data
 2017-08-04 10:52:01 +05:30
Nabin Hait
ee5ff805e9 Book expense included in valuation only if perpetual inventory enabled (#10271) 2017-08-03 17:37:23 +05:30
Saurabh
33aaebac2b [fix] encode title and description in payment request (#10240) 2017-08-03 11:47:05 +05:30
tunde
4a263c714d get_party_detail should use default currency of party 2017-08-02 22:26:39 +01:00
Nabin Hait
f5dee777dd minor fix in applying pricing rule 2017-08-02 19:08:39 +05:30
mbauskar
2dd57acdef removed merge conflicts 2017-08-02 18:39:04 +05:30
Vishal Dhayagude
ed0b107a9f [UI Test] UI test added for Pricing Rule (#10237) 
* [UI Test] UI test added for Pricing Rule

* [mod]minor chages in pricing rule test

* [fix] codacy fixed
 2017-08-02 17:31:20 +05:30
Vishal Dhayagude
f9e4893d9d [UI Test] Test added for Shipping Rule (#10229) 
* [UI Test] Test added for Shipping Rule

* [fix]Travis Failed
 2017-08-02 17:16:46 +05:30
Nabin Hait
9641d5b1f4 Make payment entry button in expense claim and some minor cleanup 2017-08-01 17:38:48 +05:30
Nabin Hait
edba79e8f0 Update utils.py 2017-08-01 17:38:48 +05:30
Ben Cornwell-Mott
38d4be8325 Update manuals. Fix codacy issues 2017-08-01 17:38:47 +05:30
Ben Cornwell-Mott
118ceda46f Add Payment Entry for Expenses 2017-08-01 17:35:50 +05:30
Makarand Bauskar
317888211a merged hotfix branch into staging (#10191) 
* [Fix] Error in sales invoice and POS if customer group not defined in the customer (#10148)

* Revert "[Fix] Error in sales invoice and POS if customer group not defined in the customer (#10148)" (#10159)

This reverts commit 4d2e782e42.

* [Fix] Unable to save asset because of float error issue (#10157)

* bumped to version 8.6.4

* [Fix] Error in sales invoice and POS if customer group not defined in the customer (#10160)

* Set billing hours to 0 in timesheet #9535 (#10139)

* `update_billing_hours` to use flt not cint

* if not billable, reset billable hours

* if not billable, reset time rates

* test

* [Fix] Timesheet Company Issue

* Added delivery date in SO parent form. Fixes #10104 (#10155)

* Added delivery date in SO parent form. Fixes #10104

* UI tests for sales order delivery date

* bumped to version 8.6.5
 2017-08-01 11:06:41 +05:30
Nabin Hait
cd95134267 Rounding issue in tax calculation (#10135) 
* Adjust rounding loss of discount in the last item row. Fixes #8952

* Fixed rounding issue in tax calculation. Fixes #8953, #8952, #8893, #6954, #8910

* Rounding related fixes for purchase cycle
 2017-07-31 18:07:45 +05:30
mbauskar
8b6f7914b0 resolved merge conflicts 2017-07-31 12:30:53 +05:30
Nabin Hait
1fcd2b0676 Merge branch 'develop' into set_defualt_mode_payment 2017-07-28 21:09:42 +05:30
rohitwaghchaure
e2176b852e [Fix] Error in sales invoice and POS if customer group not defined in the customer (#10160) 2017-07-28 20:52:02 +05:30
mbauskar
3b27382013 Merge branch 'master' into develop 2017-07-28 16:03:52 +05:30
rohitwaghchaure
353af64197 [Fix] Unable to save asset because of float error issue (#10157) 2017-07-28 15:55:46 +05:30
Makarand Bauskar
8bccaed35a Revert "[Fix] Error in sales invoice and POS if customer group not defined in the customer (#10148)" (#10159) 
This reverts commit 4d2e782e42.
 2017-07-28 15:43:23 +05:30
rohitwaghchaure
4d2e782e42 [Fix] Error in sales invoice and POS if customer group not defined in the customer (#10148) 2017-07-28 15:21:22 +05:30
Makarand Bauskar
20f4d7f559 Merge branch 'develop' into set_defualt_mode_payment 2017-07-28 14:41:48 +05:30
Rushabh Mehta
d50da78f28 [fixes] errors caught on flake8 (#10126) 2017-07-28 11:39:01 +05:30
Rohit Waghchaure
120b6c0b3c UI test cases and documentation 2017-07-28 01:52:10 +05:30
Rohit Waghchaure
5296e3c321 [enhance] Provision to set default mode of payment for the POS in POS profile 2017-07-27 19:17:05 +05:30
Saurabh
c07741d36f Merge branch 'master' into staging 2017-07-27 17:50:28 +05:30
mbauskar
7b764d03c2 Merge branch 'master' into develop 2017-07-27 12:18:15 +05:30
Vishal Dhayagude
b528411ed1 [ui test]sales and taxes charges template (#10116) 2017-07-27 12:15:06 +05:30
tundebabzy
9281013d51 add transaction date call to get_exchange_rate (#10109) 2017-07-27 11:43:32 +05:30
rohitwaghchaure
059f99e621 [Fix] Wrong avg. buying rate in the Gross Profit report (#10110) 2017-07-27 11:37:30 +05:30
rohitwaghchaure
8579dd1d78 [minor] If customer has removed getting an error (#10107) 2017-07-27 11:21:54 +05:30
cclauss
6848708377 old style exception, raise --> new style for Python 3 (#10082) 
* old style raise --> raise() for Python 3

* old style exception --> new style for Python 3

* old style exception --> new style for Python 3

* old style exception --> new style for Python 3

* old style exception --> new style for Python 3

* old style exception --> new style for Python 3

* old style exception --> new style for Python 3

* old style exception --> new style for Python 3

* old style exception --> new style for Python 3

* old style exception --> new style for Python 3

* old style raise --> raise() for Python 3

* old style raise --> raise() for Python 3

* old style exception, raise --> new style for Python 3
 2017-07-27 10:38:35 +05:30
Vishal Dhayagude
c67bf5026e [UI Test] Create tax account in Charts of account (#10105) 
* [new]tax creation added

* [new]path added test.txt
 2017-07-27 09:11:08 +05:30
tundebabzy
de54f3019f use api to get default cost center for chosen company (#10067) 2017-07-25 11:05:07 +05:30
Rushabh Mehta
9d27cf3c62 [tests] refactored (#9984) 
* [tests] refactored

* [fix] test_quotation.js

* [fix] tests.text

* [fix] fiscal year not needed

* [test] add long test

* [fix] add timeout in lead
 2017-07-20 15:35:03 +05:30
mbauskar
0e6933a1e8 resolved merge conflicts 2017-07-20 14:19:47 +05:30
Nabin Hait
9c42161061 Itemised tax breakup fix in docs other than invoice (#9961) 
* Itemised tax breakup fix in docs other than invoice

* Set itemised tax breakup and hsn code in existing docs
 2017-07-20 13:32:01 +05:30
Nabin Hait
8e0f23efc7 Multiple delivery dates in Sales Order and make DN based on selected delivery dates (#9933) 
* Multiple delivery dates in Sales Order and make DN based on selected delivery dates

* Test case and some other minor fixes

* Updated docs for multi delivery date

* removed the trailing whitespace

* removed the trailing whitespace

* removed trailing whitespace
 2017-07-20 10:30:59 +05:30
_JG_
96bb6099d6 [fix] correctly choice 'Credit Limit' (#9932) 
* [fix] correctly choice 'credit limit'

If 'Credit Days Based On' is empty in 'Supplier Type/Customer Group' then value 'Due Date' in 'Purchase/Sales Invoice' doesn't taken from the default settings

* Update party.py

* [fix] correctly choice 'Credit Limit'
 2017-07-19 10:27:09 +05:30
Nabin Hait
bc3acdd0ba Merge pull request #9510 from tundebabzy/issue-9166 
Unable to create Manual Depreciation of Asset due to Error #9166
 2017-07-18 15:44:18 +05:30
Nabin Hait
338c28e78e Merge pull request #9902 from rohitwaghchaure/sales_invoice_serial_no_issue_from_dn 
[Fix] Sales invoice serial no validation issue
 2017-07-18 13:05:50 +05:30
Rohit Waghchaure
7e14996995 [Fix] Sales invoice serial no validation issue 2017-07-18 12:59:55 +05:30
Makarand Bauskar
c446bf6117 Merge branch 'develop' into rejected_expense_claim_issue 2017-07-18 10:54:13 +05:30
Prateeksha Singh
e012e24423 Sales Goal by Company (#9723) 
* [sales goal] in company; dashboard, graph, notifs, wiz

* [test] target notifications

* cache past year monthly sales of every company daily, patch

* [minor] query fixes

* update sales goal docs
 2017-07-18 10:35:12 +05:30
tunde
78d2f542d0 code fix as per review 2017-07-17 15:00:45 +01:00
Nabin Hait
b962fc1573 Show hsn code in tax breakup for India and render via template (#9866) 
* Show hsn code in tax breakup for India and render via template

* tax breakup if gst_tax_field does not exists

* Fixed tax-breakup test cases
 2017-07-17 18:02:31 +05:30
tunde
1ee534889f Revert "adds if statement for reference_type === "Asset"" 
This reverts commit c7e3a09cfb.
 2017-07-17 13:27:59 +01:00
Rohit Waghchaure
8333b5754b [Fix] Expense claim status issue 2017-07-17 16:38:20 +05:30
Nabin Hait
35d0de8276 Merge pull request #9858 from mbauskar/expense-claim 
[minor] don't trigger the expense type trigger if value is not set
 2017-07-14 15:28:34 +05:30
Rushabh Mehta
812853aa86 [refactor] account.js to new style (#9787) 
* [fix] conference site update

* [test] run all js tests
 2017-07-14 15:28:04 +05:30
mbauskar
00e825a8af [minor] check if account is selected or not in Payment Entry 2017-07-14 11:38:39 +05:30
Nabin Hait
57d3cecd68 Merge pull request #9811 from rohitwaghchaure/pricing_rule_issue_for_discount 
[Fix] Manual discount is not applying in the transaction if discount amount is zero in the pricing rule
 2017-07-13 11:14:53 +05:30
Nabin Hait
7312186c76 Set corrected states list in GST State field's options 2017-07-13 10:41:15 +05:30
Nabin Hait
0a32b7a6eb Set company address while making invoice from SO, don't show taxes in print if amount is zero, fixed state code 2017-07-12 19:21:05 +05:30
Rohit Waghchaure
b12f2109b5 [Fix] Manual discount is not applying on the pricing rule if discount amount is zero in the pricing rule 2017-07-12 18:02:02 +05:30
rohitwaghchaure
860144feb7 [Fix] User not able to search an Item if description is null in the item (#9793) 2017-07-12 15:01:56 +05:30
Nabin Hait
2bedca04ae Merge pull request #9750 from rohitwaghchaure/taxable_amount_issue 
[Fix] Taxable amount in tax breakup showing wrong value for duplicate items in the invoice
 2017-07-11 11:16:56 +05:30
Rohit Waghchaure
296fbfeaac [Fix] Taxable amount in tax breakup showing wrong value for duplicate items in the invoice 2017-07-10 23:06:49 +05:30
Nabin Hait
0ac8542eaa Merge pull request #9772 from tundebabzy/issue-9595 
Wrong Exchange Rate when making payment against Journal Entry (#9595)
 2017-07-10 19:12:48 +05:30
Nabin Hait
5b2d3222f3 Merge pull request #9710 from rohitwaghchaure/sales_invoice_dn_link_revert 
Revert sales invoice dn link issue
 2017-07-10 18:47:38 +05:30
Nabin Hait
cf82c3828e Merge pull request #9769 from manassolanki/payment-entry 
frappe call if posting date is defined
 2017-07-10 17:57:26 +05:30
tunde
46ef26df71 treat use case where Journal entry is contained in outstanding_invoices in get_outstanding_reference_documents function 2017-07-10 13:05:29 +01:00
Manas Solanki
99d571a786 frappe call if posting date is defined 2017-07-10 17:33:27 +05:30
Rohit Waghchaure
e3ae600277 [Fix] Budget against the field in the validation message 2017-07-10 17:06:54 +05:30
Rohit Waghchaure
8f2c8f6e9d Revert sales invoice dn link issue 2017-07-07 17:07:59 +05:30
Rohit Waghchaure
9589527784 Fixed the issue Serial No serial no not found 2017-07-07 15:34:28 +05:30
Nabin Hait
8b486b0f28 Fixed state code of WB and allowed invoice_copy to edit after submit 2017-07-07 13:14:25 +05:30
Nabin Hait
fbb5945ff3 Fixed itemised tax calc to fix pos loading 2017-07-07 12:58:22 +05:30
Nabin Hait
7773ee8960 Sales invoice dashboard, multiple letter head in report and email alert docs 2017-07-07 12:49:05 +05:30
Rohit Waghchaure
6d03790b44 Revert sales invoice serial no issues 2017-07-06 15:58:50 +05:30
Nabin Hait
f3f0dfef2a Invoice copy, state code in gst print format, hsn code in other sales/purchase docs (#9658) 
* Invoice copy, state code in gst print format, hsn code in other sales/purchase docs

* Formatted Net Amount in item-tax-breakup

* GST print format fixes

* removed trailing whitespace

* removed trailing whitespace
 2017-07-06 14:49:34 +05:30
Makarand Bauskar
48af4289d3 Revert "[enhance] Provision to set the currency in the pricing rule for the price" (#9636) 2017-07-05 15:17:02 +05:30
Nabin Hait
852cb64e4f GST tax invoice print format and more (#9616) 
* GST Tax Invoice print format and more. Fixes #9545 #9566 #9608

* Reload gst print format only for Indian users

* Fixes as Codacy
 2017-07-05 12:58:19 +05:30
mbauskar
b66fb9a4c0 Merge branch 'master' into develop 2017-07-05 11:25:15 +05:30
rohitwaghchaure
e5ca48a76a [fix] Don't update the sales invoice number into the serial no if update stock is disabled in the invoice (#9593) 2017-07-04 10:54:23 +05:30
rohitwaghchaure
3e4bcfe2d8 [Fix] Opening Entry, Unknown column 'warehouse' in 'where clause' (#9585) 
* [Fix] Opening Entry, Unknown column 'warehouse' in 'where clause'

* escaped company name in get_opening_accounts
 2017-07-04 10:49:37 +05:30
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
tunde
690de64734 Merge branch 'develop' into issue-9166 2017-06-28 13:37:04 +01:00
tunde
c7e3a09cfb adds if statement for reference_type === "Asset" 2017-06-28 13:23:18 +01:00
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
rohitwaghchaure
97fd21a01d [Fix] Accounts receivable summary report not loading data because credit note column was missing (#9191) 
* [Fix] Accounts receivable summary report not loading data because credit note column was missing

* Create accounts_receivable_summary.py
 2017-06-09 14:05:10 +05:30
tunde
0a5db528b1 makes sure latest test fixtures for currency exchange is retrieved before running test 2017-06-09 08:14:10 +01:00
tunde
9b827e5b95 makes set_exchange_rate retrieve the latest exchange rate not average for "pay" and "internal transfer" payment entries 2017-06-08 20:54:01 +01:00
tunde
6148fe0909 adds test case to confirm that latest exchange rate is automatically selected 2017-06-08 20:50:11 +01:00
tunde
3eb5cb14d1 calls erpnext.setup.utils.get_exchange_rate instead of get_average_exchange_rate 2017-06-08 14:23:49 +01:00
Nabin Hait
2c808c578d Merge branch 'master' into develop 2017-06-08 10:34:45 +05:30
rohitwaghchaure
1607125815 [minor] POS customer creation was disabled in offline mode (#9169) 2017-06-07 20:06:58 +05:30
Makarand Bauskar
59a1540898 [minor] removed the deprecated inList method from eval (#9177) 2017-06-07 20:02:09 +05:30
tundebabzy
98f8da1294 hides payments field when is_pos is checked (#9174) 2017-06-07 20:01:51 +05:30
Nabin Hait
a128b21baa Fixed merge conflict 2017-06-07 12:17:17 +05:30
rohitwaghchaure
d2be55b2e0 [Fix] Orders not creating from the POS for new customer if customer name is based on naming series (#8933) 
* [Fix] Orders not creating from the POS for new customer if customer name is based on naming series

* [fix] Disabled price field in POS, if Allow User to Edit Rate field is disabled in POS profile

* added customer name in the search bar of the customer

* search customer by phone number and email id in the POS
 2017-06-07 12:04:01 +05:30
Nabin Hait
17378e8a29 Added a new column for Credit/Debit Note in AR/AP report (#9123) 2017-06-07 11:56:53 +05:30
Prateeksha Singh
3a18dea8a4 [fix][multiselect] don't show completed PRECs for a PINV (#9125) 2017-06-07 11:55:25 +05:30
rohitwaghchaure
ce6e621c18 [fix] Not able to cancel the invoice if it's linked with the timesheet (#9157) 2017-06-07 11:52:04 +05:30
Faris Ansari
5f27c94100 Merge pull request #9078 from netchampfaris/remove-globals 
Lint and fix JS files
 2017-06-06 11:35:42 +05:30
Ashwini Save
2020dd37e8 Fixed issue : Payment Entry allocating amount more than invoice amount. (#9084) 
* Fixed issue : Payment Entry allocating amount more than invoice amount.

* Added condition to solve issue when allocated amount is null

* Code review Changes for payment entry
 2017-06-01 19:00:34 +05:30
Nabin Hait
c9fa07b16d Merge branch 'master' into develop 2017-05-30 15:59:04 +05:30
Nabin Hait
ac3b2aa913 Set change amount automatically only if it is a cash transaction (#9065) 2017-05-30 15:35:01 +05:30
Faris Ansari
ab74ca7fff Lint and fix JS files 2017-05-30 12:54:42 +05:30
Nabin Hait
6a541a6f7a Merge branch 'master' into develop 2017-05-26 21:35:42 +05:30
Prateeksha Singh
e38c70c8bc [fix] uppercase filter frappe/erpnext#8996 (#9026) 2017-05-26 21:34:18 +05:30
Nabin Hait
4b12896941 Party Dashboard: Consider any random company if default company not set (#9046) 2017-05-26 21:25:36 +05:30
Ashwini Save
d702cbfbfa Update code to fix issue #erpnext WN-SUP25349 : ValueError: max() arg is an empty sequence. (#9025) 2017-05-25 15:48:08 +05:30
Nabin Hait
45d337a016 Merge branch 'master' into develop 2017-05-25 14:19:51 +05:30
Nabin Hait
7e7dc0f254 Update party.py 2017-05-25 14:18:20 +05:30
Nabin Hait
c795386230 Fixed merge conflict 2017-05-24 18:39:16 +05:30
Nabin Hait
b3d4326dcc Revert "Prompt for mandatory batch number in POS (#8928)" 
This reverts commit ce9ac7885e.
 2017-05-24 17:33:07 +05:30
Charles-Henri Decultot
ce9ac7885e Prompt for mandatory batch number in POS (#8928) 
* Prompt for mandatory batch number in POS

* Whitespaces correction
 2017-05-24 17:29:23 +05:30
Nabin Hait
258f7da778 Paid amount + Write Off Amount can not be greater than Grand Total in return POS 2017-05-24 17:12:07 +05:30
Nabin Hait
24f0b13b22 Total unpaid amount in party is based on GLE 2017-05-24 16:46:56 +05:30
Nabin Hait
2d79a641c2 Annual billing amount in party dashboard based on grand total 2017-05-24 16:46:56 +05:30
Makarand Bauskar
3b9c2a4438 Added a reference of Sales Invoice in Serial No (#8855) 
* [enhance] added Sales Invoice reference in Serial Number

* [patch] added test cases for Sales Invoice and added patch to copy sales invoice

* [minor] minor fixes in validate_serial_against_delivery_note

* [minor] fixes in sales invoice serial number validation
 2017-05-23 18:45:34 +05:30
Nabin Hait
dce8dfc4fe Merge branch 'master' into develop 2017-05-23 17:48:43 +05:30
Makarand Bauskar
724cc35421 [minor] added columns to pos print_template (#8978) 2017-05-23 17:43:42 +05:30
Nabin Hait
c9f5d84742 Merge branch 'master' into develop 2017-05-23 17:16:19 +05:30
Faris Ansari
29d64cae34 POS print format fix (#8973) 2017-05-23 17:12:51 +05:30
Rushabh Mehta
2b06633919 Merge branch 'master' into develop 2017-05-19 19:24:43 +05:30
rohitwaghchaure
177a26849d [fix] Trial balance not working (#8937) 2017-05-19 18:56:25 +05:30
Charles-Henri Decultot
8bec0239b9 Prompt for mandatory batch number in POS (#8928) 
* Prompt for mandatory batch number in POS

* Whitespaces correction
 2017-05-19 16:02:30 +05:30
Ayush Shukla
ae696d005a Changed report_hide=0 for reference_name (#8902) 2017-05-19 12:38:08 +05:30
Rushabh Mehta
6799e27390 [fix] chart of accounts root sorting, #8784, #8897 (#8904) 2017-05-18 16:21:21 +05:30
Nabin Hait
61ac683847 Fixed chart of accounts for Indonesia (#8900) 2017-05-18 11:58:38 +05:30
Nabin Hait
8fac2ad183 Don't set batch nos automatically on saving, if already set and validate qty with batch (#8887) 2017-05-18 11:54:24 +05:30
Nabin Hait
08ea710c8f Minor fix in creating chart of accounts based on existing (#8890) 2017-05-17 19:43:12 +05:30
Nabin Hait
4b544347a9 Hide 'Edit Posting Time' from printing (#8888) 2017-05-17 19:42:38 +05:30
tundebabzy
cf7df5d106 fixes #8883 (#8885) 2017-05-17 19:17:04 +05:30
Sagar Vora
3b04b030eb Fix cost center not getting pulled in DN and SINV (#8878) 
* Fixes for getting selling cost center instead of company's default cost center.

* fix error in update_item
 2017-05-17 19:16:27 +05:30
Nabin Hait
1e2d7b3519 Filters for multiselect dialog for DN/PR in Sales/Purchase Invoice (#8882) 2017-05-17 13:52:21 +05:30
rohitwaghchaure
3da400b532 [fix] Due Date cannot be before Posting Date during amendement of an invoice (#8841) 2017-05-16 12:43:18 +05:30
rohitwaghchaure
654f186f95 [fix] Apply pricing rule on the item based on quantity as per stock uom (#8792) 2017-05-16 08:54:29 +05:30
rohitwaghchaure
09483d3c0f [fix] Numeric keypad not displaying after creation of new customer (#8797) 2017-05-16 08:51:24 +05:30
rohitwaghchaure
d678809939 [fix] Party balance field showing wrong currency symbol (#8832) 2017-05-16 08:06:45 +05:30
Faris Ansari
769b6bada8 [POS] Add Pay menu item in mobile view (#8801) (#8845) 2017-05-16 07:31:10 +05:30
Prateeksha Singh
edeb4dc7e0 Multiselect dialog for getting items (#8583) 
* Concatenate docnames and send to mapper

* Multiselect with checkboxes

* set setters as separate filters

* Map filter fields to target_doc

* Get items from quotation (in SO) working

* [major] Set dialog setters for all forms

* Add date field

* Specify non-default date_fields

* [minor] add test_mapper.py

* [minor] remove cur_frm

* [minor][fix] test

* [minor] fix test with make_test_records
 2017-05-15 11:32:06 +05:30
Nabin Hait
5ad6126832 On saving of Accounts Settings, only save enabled warehouses (#8772) 2017-05-11 13:34:04 +05:30
Makarand Bauskar
0e4c5c9efb [minor] renamed a Total Margin field to Rate With Margin (#8720) 
* [minor] renamed a Total Margin field to Rate With Margin

* [minor] minor fixes in field lable
 2017-05-11 11:40:02 +05:30
Faris Ansari
734d7795f8 Show party name in General Ledger print report (#8760) 2017-05-11 11:38:30 +05:30
Makarand Bauskar
464f108586 [minor] added currency in Totals for Trial Balance report (#8757) 
* [minor] added currency in Totals for Trial Balance report

* [minor] used erpnext.get_default_currency to fetch the company currency
 2017-05-10 19:40:36 +05:30
Saurabh
9df45bbc42 [fix] Reference Document is required to create Payment Request (#8729) 
* [fix] Referene Document is required to create Payment Request

* Update payment_request.py
 2017-05-08 17:24:23 +05:30
Ishan Loya
120ee275cc Fix typo (#8719) 2017-05-06 12:48:22 +05:30
Nabin Hait
3257aeeb55 Price list rate fix multiple uom and validation with prev doc (#8718) 2017-05-06 12:47:14 +05:30
Nabin Hait
6e7407962f Get exchange rate only if date and currency is present (#8712) 
* Get exchange rate only if date and currency is present

* Update transaction.js
 2017-05-06 12:45:16 +05:30
Nabin Hait
d2a966eef3 Update general_ledger.py 2017-05-05 10:41:16 +05:30
Nabin Hait
932423ecba Balance Sheet always shows accumulated values from previous fiscal year (#8668) 2017-05-04 12:12:29 +05:30
rohitwaghchaure
a1923574c6 Merge pull request #8657 from rohitwaghchaure/pos_email_id_issue 
[fix] Contact not creating if only email id has entered in the POS
 2017-05-03 12:56:13 +05:30
Nabin Hait
ef027e9030 Correct args to the fmt_money function 2017-05-03 11:51:47 +05:30
Rohit Waghchaure
fd37516165 [fix] Contact not creating if only email id has entered in the POS 2017-05-02 18:27:09 +05:30
Rohit Waghchaure
61165127fc [fix] Default pos profile's customer not working for the POS 2017-05-02 13:04:08 +05:30
Rohit Waghchaure
3df7eef6cc [fix] Unable to create an asset due to rounding issue 2017-05-02 09:49:02 +05:30
Nabin Hait
2afb9b96cd pricing rule fix 2017-04-28 15:20:49 +05:30
Nabin Hait
8c9fb76854 Remove pricing rules if 'Ignore Pricing Rule' manually triggered 2017-04-28 15:20:49 +05:30
Rohit Waghchaure
0e6ac8b9b4 Enabled option User Cannot Search for the gl entry doctype 2017-04-28 10:03:18 +05:30
Nabin Hait
d5d8db7a3f Cleanup on financial statement PR 2017-04-25 16:26:33 +05:30
Nabin Hait
39bcb3de4b Merge branch 'accumulated_header_std' of https://github.com/RicardoJohann/erpnext into RicardoJohann-accumulated_header_std 2017-04-25 16:13:54 +05:30
Ishan Loya
17737e4ab1 Change permissions, change account fieldname and add notes section 2017-04-25 16:08:22 +05:30
Ishan Loya
2fca72ae8e Change owner 2017-04-25 16:08:22 +05:30
Ishan Loya
0dbe8547e7 Add screenshot to documentation, change naming series to BG-#####, make Bank Guarantee number unique 2017-04-25 16:08:22 +05:30
Ishan Loya
e1ed5ba726 Remove commented out code 2017-04-25 16:08:22 +05:30
Ishan Loya
0fc57a7df2 Change doctype owner 2017-04-25 16:08:22 +05:30
Ishan Loya
c7a72684fd Add bank guarantee doctype with documentation 2017-04-25 16:08:22 +05:30
Nabin Hait
9b20e07431 [fix] currency field precision 2017-04-25 14:09:29 +05:30
mbauskar
9cf6d630e9 [minor] fixes for expense claim status 2017-04-25 13:15:50 +05:30
Nabin Hait
e3c122d8c4 AR report: filter based on customer group and credit days based on field. Fixed #8214 2017-04-24 19:06:07 +05:30
Rohit Waghchaure
dd70fbfdae [fix] Letter head not showing in the report 2017-04-24 18:57:51 +05:30
mbauskar
bb2670d57a [fixes] minor fixes in bank reconciliation form and report 2017-04-24 10:23:50 +05:30
mbauskar
c3d642e5d1 [minor] allow bulk edit for doctype 2017-04-21 17:50:40 +05:30
Nabin Hait
68ae9f3f88 Merge branch 'develop' into allow_on_submit_fix 2017-04-19 21:10:23 +05:30
mbauskar
8f3cc81302 [minor] minor fixes in pricing_rule and set_missing_value 2017-04-19 21:05:37 +05:30
mbauskar
9e9d242a24 [minor] fixes in test cases and added the test case for multiple uom in selling 2017-04-19 21:05:37 +05:30
mbauskar
287fe81329 [minor] calculate price list rate based on items uom 2017-04-19 21:05:37 +05:30
Nabin Hait
f382373cf4 Merge branch 'develop' into develop 2017-04-19 21:01:19 +05:30
Nabin Hait
8691e0777b Update purchase_invoice_item.json 2017-04-19 20:58:09 +05:30
Nabin Hait
2de3bf7a0f Fixed indexes on sales and purchase transactions 2017-04-19 20:58:09 +05:30
Rohit Waghchaure
f4f774d1df [fix] offline_pos_name is not defined during print from the POS 2017-04-19 20:50:35 +05:30
Nabin Hait
2704162f5a Fixes allowd on submit 2017-04-19 16:25:39 +05:30
Nabin Hait
117be7ddd5 Added a settings in Accounts Settings to disable booking depreciation entry automatically 2017-04-18 14:03:06 +05:30
Nabin Hait
8a01980757 Unlink Journal Entry reference from Asset 2017-04-18 13:11:10 +05:30
Rohit Waghchaure
d7de3c606b [fix] Pricing rule for pos 2017-04-17 17:32:36 +05:30
Nabin Hait
e2431fd5e9 minor fix 2017-04-17 15:35:36 +05:30
Nabin Hait
83ca262e38 Merge pull request #8453 from StrellaGroup/develop 
[fix] Stock Entry - Change "Is Sample Item" to "Allow Zero Valuation Rate"
 2017-04-17 14:00:12 +05:30
mbauskar
22cedeb006 [minor] POS & RFQ format_number fixes 2017-04-17 12:24:24 +05:30
Javier Wong
54d9c9eaf4 Merge branch 'develop' into develop 2017-04-14 18:33:44 +08:00
Javier Wong
9b11d9b45d [fix] Stock Entry - Change "Is Sample Item" to "Allow Zero Valuation Rate" 2017-04-14 18:24:04 +08:00
mbauskar
1e05077b1f [minor] sales register report fixes 2017-04-14 09:59:49 +05:30
Faris Ansari
185762aeeb update label 2017-04-13 12:36:08 +05:30
Faris Ansari
19f90e984e [POS] Show stock quantity of items 
- frappe/erpnext#8247
 2017-04-12 16:06:31 +05:30
Faris Ansari
b5608f9b14 [fix] Default Print Format for Sales Invoice (#8419) 
- frappe/erpnext#8416
 2017-04-12 15:31:01 +05:30
rohitwaghchaure
5adce495aa Merge pull request #8417 from rohitwaghchaure/due_date_issue 
[fix] POS, Due Date cannot be before Posting Date
 2017-04-12 14:43:21 +05:30
Rohit Waghchaure
2192c244c0 [fix] POS, Due Date cannot be before Posting Date 2017-04-12 13:19:05 +05:30
mbauskar
2f9703c20e [minor] set company_currency as account_currency in general ledger if party type is employee 2017-04-11 18:56:41 +05:30
joezsweet
768a888bf2 [fix] validate supplier invoice 
- modified to check for the selected supplier only
 2017-04-11 18:52:46 +05:30
Rohit Waghchaure
87ad6d074a [enhance] Stock qty added in purchase invoice 2017-04-11 18:29:52 +05:30
Kanchan Chauhan
95108ac80b [Minor] Party validation for Employee 2017-04-11 18:29:27 +05:30
mbauskar
236f7aac7f [minor] track changes for transaction documents 2017-04-10 14:48:54 +05:30
Nabin Hait
549a2827e5 Merge pull request #8300 from rohitwaghchaure/customer_edit_issue_v8 
[fix] Customer edit issue in offline POS
 2017-04-05 14:51:44 +05:30
Rohit Waghchaure
2861955632 [fix] Customer edit issue in offline POS 2017-04-04 09:59:29 +05:30
Nabin Hait
731efe3a95 Minor fix in gross profit report 2017-04-03 12:11:36 +05:30
Nabin Hait
2c892c7e7f Indentation fixed in gross profit report 2017-04-03 12:05:35 +05:30
Nabin Hait
b15d999147 Merge branch 'develop' into gross_profit_issue_v_8 2017-03-31 17:39:45 +05:30
Rushabh Mehta
f0b4562a95 [refactor] move purchase_common.js -> public/js/controllers/buying.js 2017-03-31 17:36:48 +05:30
Rushabh Mehta
cc8b2b2fdb [fix] [refactor] demo for v8 and remove purchase common 2017-03-31 17:36:48 +05:30
Rohit Waghchaure
34b1dba9aa [fix] get_valuation_rate takes 4 arguments 3 given in gross profit report 2017-03-31 12:44:10 +05:30
Ricardo Johann
033e2fa8b6 changed accumulated header 2017-03-31 02:18:54 -03:00
Nabin Hait
620bde7144 Updated modified date to reload sales uom 2017-03-30 19:50:45 +05:30
Nabin Hait
e503f68ec7 Merge pull request #8229 from rohitwaghchaure/pos_highlight_issue 
[fix] POS cart item's highlighted issue
 2017-03-30 19:26:33 +05:30
Rohit Waghchaure
a86bb69adf [fix] POS cart item's highlighted issue 2017-03-30 19:16:38 +05:30
Nabin Hait
1f6bd0ad37 Fixed merge conflict 2017-03-30 13:15:22 +05:30
Ricardo Johann
3d1434afe7 Export total labels 2017-03-29 17:44:17 +05:30
Makis Etzoglou
82e6bc45e4 tax_id add to Sales Order, Delivery Note, and Sales Invoice 2017-03-29 17:39:08 +05:30
mbauskar
de98ff6bb9 [minor] hide the stock details section if update_stock is unchecked 2017-03-29 17:29:58 +05:30
Nabin Hait
da749f716b Merge pull request #8172 from rohitwaghchaure/credit_note_serial_no_issue 
[fix] During making credit note from sales invoice, system fetching new serial no instead of old serial no from the sales invoice
 2017-03-28 13:49:32 +05:30
Nabin Hait
77c970549b In gross profit report, if incoming rate not found from last sle, consider average valuation rate 2017-03-28 12:20:31 +05:30
Rohit Waghchaure
5ecbaa408b [fix] During making credit note from sales invoice, system fetching new serial no instead of old serial no from the sales invoice 2017-03-28 12:09:07 +05:30
Nabin Hait
8bf58367b8 Fixed merge conflict 2017-03-27 12:30:01 +05:30
Nabin Hait
9c8159be8f Merge pull request #8129 from rohitwaghchaure/pos_v8_enhance_and_issue 
[fix] customer edit, numeric keypad visibility, on selection of item highlight the background issue in the pos
 2017-03-27 12:25:18 +05:30
Rohit Waghchaure
b719dc53fc [fix] customer edit and numeric keypad visibility issue in the pos 2017-03-24 17:03:50 +05:30
Nabin Hait
bf2a7efca4 Account name changed in standard chart of accounts 2017-03-24 13:01:35 +05:30
Nabin Hait
f44f04e33a Merge pull request #8063 from khrlzhfr/patch-1 
Update standard_chart_of_accounts.py
 2017-03-23 17:01:34 +05:30
Nabin Hait
c7dc838306 Merge pull request #8068 from rohitwaghchaure/asset_depreciation_issue 
[fix] Precision issue during making of depreciation schedule
 2017-03-23 16:59:12 +05:30
Rohit Waghchaure
57f35a25a1 [fix] UnpickleError, removed _ method from the argument of the function 2017-03-23 14:55:52 +05:30
Rohit Waghchaure
6ee91ec9c6 on selection of row highlight the background in the cart 2017-03-21 15:55:09 +05:30
Faris Ansari
e1acb766ac [fix] asset image in image view 2017-03-21 14:18:30 +05:30
Rohit Waghchaure
b69d311268 [fix] precision issue during making of depreciation schedule 2017-03-20 16:30:34 +05:30
Khairil Zhafri
4d6d456a0d Update standard_chart_of_accounts.py 
Minor spelling edits
 2017-03-20 00:15:34 +08:00
rohitwaghchaure
2b9c95a940 Merge pull request #8043 from rohitwaghchaure/pos_issue_v8 
[fix] POS, amount not updating on change of price, on zero of discount rate has not reset, pricing rule not working for brand
 2017-03-16 17:56:20 +05:30
Rohit Waghchaure
75177c0e35 [fix] POS, amount not updating on change of price, on zero of discount rate has not reset, pricing rule not working for brand 2017-03-16 15:47:25 +05:30
mbauskar
27efc91db0 [minor] make item code mandatory if update_stock is selected 2017-03-15 18:57:18 +05:30
Rushabh Mehta
f340e19ea7 [minor] field re-arrangements in sales invoice, purchase invoice, stock reco 2017-03-15 15:12:43 +05:30
Nabin Hait
ee7b4f2882 Merge pull request #8016 from rmehta/posting-date-option 
[feature] posting date, time is always current unless explicitly set
 2017-03-15 11:22:04 +05:30
Nabin Hait
505ed25f10 Merge pull request #8017 from nabinhait/develop 
Field order changed for 'Qty as per Stock UOM'
 2017-03-14 22:39:36 +05:30
Nabin Hait
79bce2a71d Merge pull request #8019 from rohitwaghchaure/pos_serial_no_issue 
[fix] User sales one serial number multiple time from the POS
 2017-03-14 22:38:28 +05:30
Rushabh Mehta
4f3da42b75 [fixes] for tests 2017-03-14 21:29:55 +05:30
Rushabh Mehta
131866a11a [fixes] for tests 2017-03-14 21:06:15 +05:30
Rushabh Mehta
82c258948d [fixes] for recurring and tests 2017-03-14 19:13:39 +05:30
Rohit Waghchaure
e259a9b068 [fix] User sales one serial number multiple time from the POS 2017-03-14 19:05:21 +05:30
Nabin Hait
3d731df7e3 Field order changed for 'Qty as per Stock UOM' 2017-03-14 17:24:57 +05:30
Rushabh Mehta
6d4a52562b [fix] posting date, time is always current unless explicitly set 2017-03-14 17:06:51 +05:30
Rushabh Mehta
6b53792aea [fix] posting date, time is always current unless explicitly set 2017-03-14 17:06:51 +05:30
Rohit Waghchaure
faedf8274c [fix] gross profit permission issue 2017-03-14 14:56:24 +05:30
Saurabh
0d47d51407 [fix] modified payment request to cope with new payment structure (#7957) 
* [fix] modified payment request to cope with new payment structure

* [fix] moved payment gateway doctype from accounts to core
 2017-03-14 14:46:05 +05:30
Rohit Waghchaure
cc034a8983 [fix] Value assignment issue for country in the pos profile 2017-03-13 22:44:48 +05:30
Nabin Hait
1ed8bc4c36 Gross Profit report: Consider Sales team table only if grouped by sales person 2017-03-12 17:10:41 +05:30
Nabin Hait
fb4b8d926f Company based on exising company fix 2017-03-12 16:55:05 +05:30
Nabin Hait
d0d22ff203 copy letter head from invoice to payment entry 2017-03-12 16:55:05 +05:30
Nabin Hait
c5204f56e2 Merge pull request #7909 from KanchanChauhan/employee-loan-jv 
JV on submitting Employee Loan
 2017-03-12 16:50:48 +05:30
Rohit Waghchaure
87fa59a710 [Fix] Customer delete, customer edit functionality, added country field in the pos profile 2017-03-10 19:37:02 +05:30
Faris Ansari
1fe1518398 [pos] ui cleanup 2017-03-10 17:00:43 +05:30
Rohit Waghchaure
6068aecc2e minor fix 2017-03-10 17:00:43 +05:30
Faris Ansari
07c9f35779 ui cleanup 2017-03-10 17:00:42 +05:30
Faris Ansari
45510109b6 [pos] cleanup 2017-03-10 17:00:42 +05:30
Rohit Waghchaure
017f5005e0 fixed pos numeric keypad functionality 2017-03-10 17:00:42 +05:30
Faris Ansari
339d9c954a minor changes 2017-03-10 17:00:42 +05:30
Rohit Waghchaure
1312fe31a9 Provision to edit customer and address details 2017-03-10 17:00:42 +05:30
Rohit Waghchaure
56a7974b58 added event on numeric keypad 2017-03-10 17:00:41 +05:30
Rohit Waghchaure
86ab6a93b4 [Enhancement] POS, numeric keypad 2017-03-10 17:00:41 +05:30
Faris Ansari
1f261a8695 UI changes 2017-03-10 17:00:41 +05:30
Rohit Waghchaure
b5097ec161 offline email for POS 2017-03-10 17:00:41 +05:30
Rohit Waghchaure
f0c7ba4b1f added event on numeric keypad 2017-03-10 17:00:40 +05:30
Rohit Waghchaure
e30f83a8af [Enhancement] POS, numeric keypad 2017-03-10 17:00:40 +05:30
Kanchan Chauhan
ffd1f112e6 JV on submitting Employee Loan 2017-03-09 12:21:37 +05:30
Nabin Hait
52daaca885 Fixed merge conflict 2017-03-08 14:30:38 +05:30
mbauskar
02198ec8b0 removed the test_clear_blank_rows test case from JE 2017-03-08 12:34:36 +05:30
Nabin Hait
33fb6ae323 Fixed merge conflict 2017-03-08 11:18:15 +05:30
mbauskar
c03f275e7a [minor] allowed the credit and debit amount to be 0 in JE 2017-03-07 11:59:55 +05:30
Rohit Waghchaure
9f4317e9b8 minor fix 2017-03-06 23:42:45 +05:30
Nabin Hait
b3ffd6b282 Merge pull request #7828 from rohitwaghchaure/update_user_roles_to_roles 
Changed userrole to has role, commonify role editor of the user
 2017-03-06 18:44:53 +05:30
Nabin Hait
fe876c0805 Test case fixed for multiple uom in selling 2017-03-06 16:41:13 +05:30
Nabin Hait
e68f32cf19 UOM Conversion in selling 2017-03-06 16:41:13 +05:30
Kanchan Chauhan
5a980ac87a UOM Conversion in Selling 2017-03-06 16:41:12 +05:30
Rohit Waghchaure
611a70a12a changes in the report roles 2017-03-06 16:36:46 +05:30
Rohit Waghchaure
e7485150a1 added roles in the report 2017-03-06 14:26:09 +05:30
Nabin Hait
c642f76a4d Fixed merge conflict 2017-02-27 14:40:53 +05:30
Rohit Waghchaure
b983f26b98 [Fix] Payment entry account Paid To Show receivable accounts for supplier 2017-02-24 15:07:54 +05:30
Nabin Hait
ff5bd680c2 Merge pull request #7840 from rmehta/new-buttons 
[enhance] connect new buttons on dashboard to custom make buttons and fix text for payment request
 2017-02-24 12:57:13 +05:30
Rushabh Mehta
509543752c [enhance] connect new buttons on dashboard to custom make buttons and fix text for payment request 2017-02-23 17:03:46 +05:30
mbauskar
d6e409ea92 [minor] hide recurring section if document is in __local state 2017-02-22 18:22:14 +05:30
Nabin Hait
5079c9ef47 Fixed merge conflict 2017-02-22 15:31:31 +05:30
mbauskar
a8fa10d2a9 [minor] minor fixes for journal entry get_exchange_rate trigger 2017-02-22 14:51:09 +05:30
Kanchan Chauhan
f2803ac427 [Fix] Throw error if item is added multiple time 2017-02-22 10:40:38 +05:30
Rohit Waghchaure
49523d7f80 [Fix] Company fiscal year issue in financial statement 2017-02-21 14:20:26 +05:30
Nabin Hait
aa968cd12e Merge pull request #7751 from nick9822/patch-3 
Next Depreciation Date is entered as past date
 2017-02-20 19:11:31 +05:30
Nabin Hait
8bb69ff8bf Fixed merge conflict 2017-02-20 19:01:04 +05:30
Nabin Hait
589f4656ad Merge branch 'develop' into in_global_search 2017-02-20 15:04:52 +05:30
Nabin Hait
9f4cb0c097 Fixed merge conflict 2017-02-20 15:00:04 +05:30
Nabin Hait
fd3ec066ce Added fields in global search 2017-02-20 13:38:31 +05:30
Rohit Waghchaure
f73d459c80 [Fix] Removed employee party type from the payment entry 2017-02-19 17:46:05 +05:30
Nabin Hait
02d987ed13 Minor fix for common tree view 2017-02-17 15:50:53 +05:30
Rohit Waghchaure
a020e4eba4 Payment entry fields issue, added total billed hours in timesheet 2017-02-17 14:51:57 +05:30
Kanchan Chauhan
1b204c8e4e Accrual Payroll System 2017-02-16 16:30:51 +05:30
nick9822
23e174c270 Validation for purchase_date 
Separate validation for purchase date.
 2017-02-16 16:26:38 +05:30
mbauskar
e7b87ad071 [minor] timestamp fixes for heatmap 2017-02-16 16:05:46 +05:30
Nabin Hait
d13d198dc8 Merge pull request #7747 from KanchanChauhan/item-name-asset 
[Minor] Item Name in Asset
 2017-02-16 15:15:23 +05:30
Nabin Hait
ea1cb68fe7 Merge branch 'master' into develop 2017-02-16 14:37:50 +05:30
Nabin Hait
99c6c79834 Update payment_entry.js 2017-02-16 14:21:04 +05:30
nick9822
e5cb3e34fe nowdate changed to purchase_date 
next depreciation date should be compared with purchase_date instead of nowdate.
 2017-02-15 15:32:50 +05:30
Kanchan Chauhan
2307f57f19 [Minor] Item Name in Asset 2017-02-15 11:52:29 +05:30
Rohit Waghchaure
ff41c82c2b [Fix] Payment Entry currency symbol issue 2017-02-15 11:44:15 +05:30
Rushabh Mehta
e6aa3b435a [minor] added make material request from Stock Entry and removed cur_frm 2017-02-09 17:47:22 +05:30
mbauskar
d487bf77e1 [minor] payment entry company trigger 2017-02-09 12:57:25 +05:30
khatrijitendra
d262eb1a1c issue in type and rate 
1. there is not such field, "type" it is "margin_type"
2. there is not such field,  "rate" it is "margin_rate_or_amount"
 2017-02-08 14:59:59 +05:30
Nabin Hait
6ff0caa87a Fixed merge conflict 2017-02-08 11:33:33 +05:30
Nabin Hait
6f93cd5bd0 Merge pull request #7692 from rohitwaghchaure/minor_fixes_v_7_2 
Minor fixes
 2017-02-08 11:21:54 +05:30
Nabin Hait
533d22e88b Merge pull request #7606 from rohitwaghchaure/data_import_tool_for_cost_center 
[Fix] Allow data import tool for cost center
 2017-02-08 11:21:25 +05:30
Rohit Waghchaure
b3489548a9 minor fix 2017-02-08 11:20:04 +05:30
Nabin Hait
70fd8546ce Merge pull request #7677 from KanchanChauhan/serial-no-in-return 
[Fix] Serial No if is_return
 2017-02-07 13:28:30 +05:30
Nabin Hait
0a6aaf4257 Get standard/historical valuation rate where missing: some minor fixes 2017-02-07 12:50:22 +05:30
Kanchan Chauhan
4f3b0aa249 [Fix]Serial No if is_return 2017-02-07 11:28:34 +05:30
Nabin Hait
ea8fab52c6 Get standard/historical valuation rate where missing, if item is not a sample item 2017-02-07 01:24:32 +05:30
mbauskar
c874a82559 [minor] index out of range fixes for JE 2017-02-06 15:41:34 +05:30
Rushabh Mehta
6ede4a3809 [enhance] production order from sales order 2017-02-02 17:42:01 +05:30
Rushabh Mehta
a3d0bea375 Merge branch 'develop' into remove-party-status 2017-02-02 15:42:04 +05:30
Rohit Waghchaure
69060a8177 Minor fix 2017-02-01 19:14:53 +05:30
Rushabh Mehta
3714626dd0 [minor] enhance BOM view 2017-02-01 18:35:53 +05:30
rohitwaghchaure
c13dbd408f [Enhancement] POS Redesign (#7639) 
* item group, discount

* POS Redesign

* offline customer

* removed offline records from modal view
 2017-02-01 18:07:22 +05:30
Rohit Waghchaure
38f808cfae [Fix] Buying rate in gross profit report 2017-02-01 13:34:06 +05:30
rohitwaghchaure
ea092a7b24 [Enhancement] Booking of an employee's expense claim (#7267) 
* [Enhancement] Auto book of an employee's expense claim

* test cases

* documentation

* fixes and changes

* removed payable from employee and added into the company

* Added party in account, patch to update party type for customer and supplier accounts

* added party type in erpnext, fix patch

* fixed travis
 2017-02-01 12:02:08 +05:30
KanchanChauhan
fbaa6197f9 Employee Loan Management (#7126) 
* [WIP] Employee Loan Management

* EMI calculation

* Fixing PR
 2017-01-30 15:15:58 +05:30
Rushabh Mehta
87037bdd56 [minor] remove party status as it leads to duplicate notifications fixes #7346, also fix for #7568 2017-01-30 13:22:51 +05:30
Rohit Waghchaure
b327429db7 [Fix] Allow data import tool for cost center 2017-01-30 11:34:29 +05:30
Ricardo Johann
34354237fd added project filter to gl and carry project filter from P&L 2017-01-24 06:46:07 -03:00
Nabin Hait
349d520ae2 Fixed merge conflict 2017-01-20 15:44:35 +05:30
Nabin Hait
bd1a628c55 Merge pull request #7545 from rohitwaghchaure/minor_issue 
[Fix] Account user not able to access the report Payment Period Based On Invoice Date
 2017-01-20 14:36:48 +05:30
Rohit Waghchaure
93c001455f [Fix] Account user not able to access the report 2017-01-20 14:18:17 +05:30
Rohit Waghchaure
84b827efcd [Fix] Budget not working properly 2017-01-20 12:33:50 +05:30
Rohit Waghchaure
2b97cee32c [Fix] POS print issue 2017-01-18 13:21:27 +05:30
robert schouten
c0888637cc [fix] accounts heatmaps now covering 366 days not 20 2017-01-18 15:25:58 +08:00
Nabin Hait
dd839055e3 Fixed merge conflict 2017-01-17 15:52:56 +05:30
Nabin Hait
1c91dc4589 Merge pull request #7475 from RobertSchouten/profitability_order 
[fix] profiability analasyis orderby name
 2017-01-17 12:39:24 +05:30
Rohit Waghchaure
f58cad6b13 [Fix] Calculate paid amount when is pos is enabled 2017-01-17 12:11:57 +05:30
Rushabh Mehta
6695830f3f [fix] warehouse test cases 2017-01-16 16:57:53 +05:30
Nabin Hait
120461efef Merge branch 'master' into develop 2017-01-16 13:04:54 +05:30
Rohit Waghchaure
685f89f2b7 [Fix] Discount not working in the POS 2017-01-14 20:47:56 +05:30
Rushabh Mehta
95439db53f [fixes] address and contact 2017-01-14 00:25:22 +05:30
Rushabh Mehta
b92087cb2d [cleanup] move contact, address to frappe 💥 2017-01-13 18:54:47 +05:30
Nabin Hait
b251cd4ccb Fixed merge conflict 2017-01-13 14:34:54 +05:30
robert schouten
1a92d54dcb [fix] profiability analasyis orderby cost center name 2017-01-13 14:52:11 +08:00
Nabin Hait
4bd42146ba Merge pull request #7462 from rohitwaghchaure/minor_pos_issue 
[Fix] POS issues
 2017-01-13 11:55:52 +05:30
Nabin Hait
8f0c060578 Merge pull request #7447 from saurabh6790/tree_param_fix 
[fix] provision to handle custom mandatory params while creating node
 2017-01-13 11:50:18 +05:30
Nabin Hait
007c87ea63 Merge pull request #7440 from nabinhait/gle_repost_optimization 
Optimization to reduce GLE reposting time for future stock transactions
 2017-01-13 11:33:42 +05:30
robert schouten
d56627f2b7 [fix] profiability analasyis orderby project name 2017-01-13 11:53:43 +08:00
Rohit Waghchaure
8afe267813 [Fix] POS issues 2017-01-12 15:22:02 +05:30
Saurabh
056276c60e [minor][fix] show date in user format 2017-01-11 15:50:09 +05:30
Saurabh
2f02101d7d [fix] provision to handle custom mandatory params while creating node 2017-01-11 12:41:01 +05:30
Nabin Hait
c0eab41ec5 Fix for Budget against Project 2017-01-11 10:16:19 +05:30
Nabin Hait
6e9d2a3c1f fixed conflict 2017-01-09 17:21:34 +05:30
Nabin Hait
8281b36a26 Merge pull request #7380 from KanchanChauhan/emailid-to-emailaddress 
Email ID renamed to Email Address
 2017-01-04 15:46:48 +05:30
Nabin Hait
f45851c245 Merge pull request #7379 from KanchanChauhan/accounts-reports 
[Enhancement] Summary link on Accounts Payable and Accounts Receivable
 2017-01-04 15:45:39 +05:30
Nabin Hait
96562e3eb7 Merge pull request #7362 from rmehta/minor-fixes 
[minor] dont get warehouse in opening entry #7353
 2017-01-04 15:42:23 +05:30
Nabin Hait
202bcc09d5 Merge pull request #7336 from rohitwaghchaure/pos_enhancement_and_issues 
[Enhancement] POS features
 2017-01-04 15:15:32 +05:30
Nabin Hait
3051a3dd97 Fixed test case for margin 2017-01-04 15:11:58 +05:30
Kanchan Chauhan
b7cc393eb8 Email ID renamed to Email Address 2017-01-03 16:45:38 +05:30
Kanchan Chauhan
f4832cf2b9 [Enhancement] Summary link on Accounts Payable and Accounts Receivable 2017-01-03 16:29:41 +05:30
Nabin Hait
1d88c65be4 Merge pull request #7374 from rohitwaghchaure/billed_report_enhancement 
[Enhancement] Consolidated billed report, changed the report type from query to script
 2017-01-02 17:40:51 +05:30
Nabin Hait
ab42fc006f Merge branch 'master' into develop 2017-01-02 17:26:55 +05:30
Nabin Hait
7fc18f359c Currency symbol for budget amount based on company 2017-01-02 17:21:34 +05:30
Nabin Hait
92254d3930 Set serial nos in DN based on FIFO based on Stock Settings 2017-01-02 17:01:27 +05:30
Rohit Waghchaure
5a383e5cdd [Enhancement] Consolidated billed report, changed type from query to script 2017-01-02 16:20:43 +05:30
Nabin Hait
06966e8e1d minor fix 2017-01-02 15:10:01 +05:30
Nabin Hait
9784d27317 Optimization to reduce GLE reposting time for future stock transactions 2016-12-30 16:21:35 +05:30
Rushabh Mehta
985cb8226d [minor] dont get warehouse in opening entry #7353 2016-12-30 15:06:54 +05:30
Nabin Hait
e97d40806f Merge branch 'master' into develop 2016-12-30 14:56:20 +05:30
Nabin Hait
9646be1d5d [fix] Make Journal Entry against SO 2016-12-30 11:14:41 +05:30
Rohit Waghchaure
bef185c404 restrict user to edit the rate in the POS 2016-12-28 15:16:49 +05:30
Rohit Waghchaure
aa9b8603b9 added paid amount in print format 2016-12-27 17:43:23 +05:30
Rohit Waghchaure
fe7a5b305f create customer from POS 2016-12-27 17:31:32 +05:30
Rohit Waghchaure
8c9c9cfc5f When a new company is made, cash account should be automatically set for Mode of Payment 2016-12-27 17:31:32 +05:30
Nabin Hait
3bcf9b5e70 Fixed merge conflict 2016-12-27 14:30:17 +05:30
Rushabh Mehta
512b85e040 [minor] replace autocomplete with awesomplete 2016-12-27 12:14:37 +05:30
Nabin Hait
c2690425e3 Merge pull request #7310 from bhupennewalkar1337/hotfix 
Fix #7202 unchecking pos will reflect automatically
 2016-12-26 16:07:19 +05:30
bhupen
bcf63a2a8f unchecking pos will reflect automatically 2016-12-23 18:00:18 +05:30
Nabin Hait
58291c77e9 Fixed version conflict 2016-12-23 17:43:42 +05:30
Nabin Hait
c2d66bdfb2 Merge branch 'master' into develop 2016-12-23 16:45:09 +05:30
Nabin Hait
0177c02c0f Merge pull request #7286 from rohitwaghchaure/pos_letter_head_issue 
minor fix
 2016-12-23 15:19:32 +05:30
Rohit Waghchaure
dd58d537d5 [Fix] POS issue for serialized items 2016-12-21 17:55:40 +05:30
Rushabh Mehta
0632ee3da9 Merge branch 'v7.2.0-beta' into develop 2016-12-21 17:31:09 +05:30
Rushabh Mehta
c6bd7ade2f [fix] inclusive tax + total bug and cleanup in stock entry get_uom, fixes #7253 2016-12-21 17:30:29 +05:30
Rohit Waghchaure
9df946e96c [Fix] Warehouse is mandatory for packing materials on the sales invoice 2016-12-21 13:27:54 +05:30
Rohit Waghchaure
d567e57f82 minor fix 2016-12-21 13:18:36 +05:30
rohitwaghchaure
34e820d02d [Enhancement] Added letter head for the report (#7250) 2016-12-20 16:54:24 +05:30
Nabin Hait
6eda07e445 Fixed merge conflict 2016-12-15 16:35:58 +05:30
Nabin Hait
f02f1bb0c7 Added standard filters 2016-12-15 14:57:20 +05:30
Nabin Hait
6a1c0665bc Merge pull request #7227 from nabinhait/country_coa 
Chart of accounts for few countries, added test cases for each country
 2016-12-15 11:31:07 +05:30
Rushabh Mehta
e9d9b8e6f0 [fix] demo and process payroll for demo (#7224) 
* [fix] demo and process payroll for demo

* [fix] set payroll dates
 2016-12-15 11:27:35 +05:30
Nabin Hait
e3edfe2b12 Removed quick entry for tax rule 2016-12-14 18:44:27 +05:30
Nabin Hait
a756d64fca Chart of accounts for some countries, added test cases for each country 2016-12-14 18:40:29 +05:30
Nabin Hait
a9ecc0b700 Merge branch 'master' into develop 2016-12-14 14:33:06 +05:30
Rohit Waghchaure
39712b5e1d [Fix] Pricing rule issue 2016-12-14 14:12:20 +05:30
Nabin Hait
a933713f9d Merge pull request #7208 from OluyomiKay/cashacct_bankreconciliation_dev 
erpnext Include CashAccountType (eg. PettyCash) in BankReconciliation
 2016-12-14 12:54:04 +05:30
Nabin Hait
3a8ea2a3bb Merge pull request #7170 from rohitwaghchaure/pos_enhancement_v7_2 
[POS] Provision to delete the offline records
 2016-12-14 12:52:28 +05:30
OluyomiKay
8f8fd39855 erpnext Include Cash Account Type (eg. Petty Cash) in Bank Reconciliation 2016-12-14 13:25:58 +08:00
Nabin Hait
201af80706 Fixed merge conflict 2016-12-13 14:30:32 +05:30
Rohit Waghchaure
2976e56d23 [Fix] Ignore pricing rule not removed the discount percentage 2016-12-13 10:28:27 +05:30
Nabin Hait
f67799197d Merge pull request #7189 from nabinhait/fix_10111 
Rename and merging of Item and Warehouse
 2016-12-12 17:27:38 +05:30
Rohit Waghchaure
9f2cc382a8 [POS] Provision to delete the offline records 2016-12-12 17:15:47 +05:30
Rohit Waghchaure
f4074c2029 [Fix] Budget variance report 2016-12-12 16:48:14 +05:30
Nabin Hait
142aab79bf Fieldtype of payment url should be Small Text 2016-12-12 15:37:52 +05:30
Rohit Waghchaure
5664f8553e [Fix] Item group missing in the POS profile 2016-12-12 12:28:07 +05:30
Saurabh
940084ed59 [minor][fix] show tax rate if account type is tax 2016-12-09 17:38:36 +05:30
Rushabh Mehta
81af229466 [minor] google analytics id in docs and minor fixes to web forms 2016-12-09 17:29:36 +05:30
Nabin Hait
58667ab123 Fixed merge conflict 2016-12-09 15:49:24 +05:30
Nabin Hait
00ae31bd1c Merge pull request #7172 from nabinhait/hotfix 
Issue fixed in Quality Inspection, P&L period and purchase register
 2016-12-09 15:44:05 +05:30
Nabin Hait
6bfdd63ec8 Merge pull request #7171 from rohitwaghchaure/payment_entry_issue 
[Fix] Payment entry showing wrong invoice amount
 2016-12-09 15:11:38 +05:30
Nabin Hait
b00df641e0 Fixed period end date if year starts in the middle of the month 2016-12-09 15:09:11 +05:30
Nabin Hait
43df804176 Fixed renamed fieldname 2016-12-09 15:09:11 +05:30
Rohit Waghchaure
e505067887 [Fix] Payment entry showing wrong invoice amount 2016-12-09 12:55:29 +05:30
Nabin Hait
ad4f1c7fd1 date is optional in get_exchange_rate 2016-12-09 12:14:47 +05:30
Nabin Hait
352d95344e Set exchange rate on change of date for Journal/Payment Entry 2016-12-08 16:06:47 +05:30
Nabin Hait
1cc55fbbcb Fixed merge conflict 2016-12-08 14:09:23 +05:30
Nabin Hait
72c5aec68b Merge pull request #7094 from manassolanki/budget 
[Enhancement] Budget Against Project #7036
 2016-12-08 13:52:33 +05:30
Nabin Hait
1b9caf90dd Merge branch 'master' into develop 2016-12-08 12:33:54 +05:30
Manas Solanki
482fa672c2 [Fix] Patch for budget_against 2016-12-08 12:16:29 +05:30
Rohit Waghchaure
86ed030b5c minor issue 2016-12-07 19:17:01 +05:30
Manas Solanki
2e0fbdeebe [Fix] Test Case 
- Previous test case fixed
- Additional test case for project against budget
 2016-12-07 18:17:26 +05:30
Manas Solanki
17faa794bf [Fix] More optimized code 2016-12-07 18:17:26 +05:30
Manas Solanki
5bd4d8a932 [Fix] Budget against Projects 
- Test case fixed
- Either cost center or project is mandatory
 2016-12-07 18:17:26 +05:30
Manas Solanki
1fa1fd7482 [Enhancement] Budget against Project 2016-12-07 18:17:26 +05:30
Nabin Hait
5c18bd9b61 Fixed merge conflict 2016-12-06 16:16:58 +05:30
Nabin Hait
3f1c50a483 Merge pull request #6920 from KanchanChauhan/delivery-note-serial-no-fifo 
[Fix] Fetch Serial No by default for  Delivery Note Item
 2016-12-05 16:51:42 +05:30
Rushabh Mehta
323c06ebbf [minor] rename icons as per FontAwesome 4 (#7136) 2016-12-05 14:17:26 +05:30
Kanchan Chauhan
af0d6378f1 [Fix] Fetch Serial No by default for Delivery Note Item 2016-12-02 18:18:04 +05:30
Nabin Hait
14a4c729b3 Merge pull request #7038 from KanchanChauhan/pricing-rule-in-shopping-cart 
Apply Pricing Rule in Shopping Cart
 2016-12-01 18:09:34 +05:30
Rohit Waghchaure
2e8a94458d allow user to edit serial no for credit note, debit note 2016-12-01 16:04:41 +05:30
Nabin Hait
7f3da5dbb1 Fixed merge conflict 2016-11-28 14:23:51 +05:30
Nabin Hait
50a240e758 Merge pull request #7061 from rohitwaghchaure/cost_center_issue 
[Fix] Cost center group not showing data in the P&L report
 2016-11-28 12:42:48 +05:30
Nabin Hait
96be3dd4f4 Merge pull request #7082 from rohitwaghchaure/pos_qty_issues 
[Fix] Wrong actual qty showing in POS
 2016-11-28 12:39:09 +05:30
Nabin Hait
a78c463e97 Multiple minor fixes 2016-11-27 16:32:41 +05:30
Rohit Waghchaure
80f5bb6a6c [Fix] Wrong actual qty showing in POS 2016-11-27 12:04:12 +05:30
Kanchan Chauhan
50593317d9 Added account types to Add Child option of COA 2016-11-26 18:49:32 +05:30
Rohit Waghchaure
bca0d73e1c [Fix] Cost center group not showing data in the P&L report 2016-11-25 14:54:34 +05:30
Rohit Waghchaure
9a36083095 [fix] Barcode and special character issue in the search box of the POS 2016-11-25 11:17:48 +05:30
Nabin Hait
3247db4827 Merge pull request #7050 from nabinhait/coa_based_on_existing_company 
Create Chart of Accounts based on existing company
 2016-11-24 13:28:11 +05:30
Nabin Hait
926d72424d Merge pull request #6699 from rohitwaghchaure/bom_price_list_issue 
[Enhancement] Currency added in the BOM
 2016-11-24 13:27:17 +05:30
Rohit Waghchaure
8c4e45ab3d cleanup timesheet 2016-11-23 17:54:47 +05:30
Nabin Hait
e0089184e6 Create Chart of Accounts based on existing company 2016-11-23 17:34:16 +05:30
bhupen
c097a4fe68 Changes in company doctype for chart of accounts 2016-11-23 17:34:16 +05:30
Nabin Hait
f89f17cdde Merge branch 'master' into develop 2016-11-23 16:00:22 +05:30
Nabin Hait
297d74a997 Unlink payment entries on cancellation of invoice 2016-11-23 15:59:00 +05:30
Nabin Hait
d194cce35c fixed merge conflict 2016-11-23 14:55:23 +05:30
Nabin Hait
cf895c220c Update account_tree.js 2016-11-23 14:44:07 +05:30
Saurabh
9342f650e0 [fix] remove root type selection while created new node and hooks call to initialize payment gateway 2016-11-23 14:06:14 +05:30
Kanchan Chauhan
2c1f399479 Apply Pricing Rule in Shopping Cart 2016-11-22 22:23:31 +05:30
Rohit Waghchaure
b1b328865e [Enhancement] Currency added in the BOM 2016-11-22 12:52:20 +05:30
Nabin Hait
d855167b9b Fixed merge conflict 2016-11-21 19:13:22 +05:30
Nabin Hait
651d8e996b Merge pull request #7020 from nabinhait/balance_sheet_fix 
Provisional Loss related fix in Balance Sheet. Fixed #6918
 2016-11-21 19:06:42 +05:30
Nabin Hait
d01d74cafd Merge pull request #7019 from nabinhait/fix_10014 
Default warehouse is mandatory only for stock item in POS. Fixed #6893
 2016-11-21 19:06:30 +05:30
Nabin Hait
3d5ef804b2 Provisional Loss related fix in Balance Sheet. Fixed #6918 2016-11-21 18:53:05 +05:30