pawan
d8e91982ca
Fixed Merge conflict
2017-12-07 12:00:01 +05:30
Nabin Hait
97b8a7b237
Minor fixes in payroll entry
2017-12-06 19:55:57 +05:30
Nabin Hait
c84476bd27
Fixed merge conflict
2017-12-06 14:17:51 +05:30
Manas Solanki
a160879159
set the reference document in the payment entry while creating from fees ( #11861 )
...
* set the reference document in the payment entry while creating from fees
* allocate the paid amount in the reference document
2017-12-06 14:05:39 +05:30
tundebabzy
6a418f2a9b
change Purchase Taxes and Charges default to 'Total' ( #11857 )
2017-12-06 13:15:33 +05:30
rohitwaghchaure
d52c64ff11
[fix] Show total for opening and closing dr/cr ( #11860 )
2017-12-06 13:14:28 +05:30
rohitwaghchaure
3a5ca927e7
[Fix] Asset depreciations and balances report showing wrong accumulated depreciation amount if multiple asset against same asset category ( #11848 )
...
* [Fix] Asset depreciations and balances report showing wrong accumulated depreciation amount if multiple asset against same asset category
* Update asset_depreciations_and_balances.py
2017-12-04 19:29:03 +05:30
Nabin Hait
a11dcb6e59
Pull items in Stock Entry from Purchase Invoice ( #11839 )
2017-12-04 13:36:50 +05:30
tundebabzy
1fb285c165
hide html example in print ( #11830 )
2017-12-04 11:13:36 +05:30
Shreya Shah
11938a47ec
fixed typo ( #11825 )
2017-12-01 17:38:26 +05:30
Nabin Hait
7a294e6ef5
Update asset_category.json
2017-11-30 18:02:22 +05:30
Nabin Hait
5e801955f1
Update asset_category.json
2017-11-30 18:01:56 +05:30
Saurabh
34a0e90115
[fix] merge conflicts
2017-11-30 16:45:01 +05:30
Faris Ansari
ec3be9eebf
[hotfix] Party Type name ( #11797 )
2017-11-30 15:53:39 +05:30
Nabin Hait
e761b9de40
Rearranged fields due to merge conflict messup
2017-11-30 14:29:10 +05:30
Rohit Waghchaure
17e03cf3fc
[minor] Removed hidden for field pos profile
2017-11-29 17:40:42 +05:30
Vishal Dhayagude
855e390265
[fix] Sales Invoice json conflict ( #11779 )
2017-11-29 16:25:24 +05:30
Vishal Dhayagude
d42242df22
[Feature] Shipping Rule Calculation based on Net Weight ( #11770 )
...
* [new] Calculate shipping tax based on weight
* [fix] Change field name weight to weight_per_unit in SI Item
* [new] Shipping Rule based tax for selling module
* [new] Shipping rule based on weight added to Buying module
* [fix] Conflict in jsons
* [fix] Removed Redudant add_fetch
* [fix] Codacy fixed
* [fix] Print hide added
2017-11-29 16:09:59 +05:30
rohitwaghchaure
f591a220c9
Fetch items of item groups defined in the pos profile ( #11763 )
2017-11-29 13:55:13 +05:30
Nabin Hait
cf9573ab2f
Removed asset doctypes files from accounts module and patches
2017-11-28 16:56:53 +05:30
rohitwaghchaure
c037dc775e
Refactor multi pos profile selection in the pos invoice ( #11721 )
2017-11-28 16:11:15 +05:30
Kanchan Chauhan
e58a41a8a2
Added maintenance to Asset and enhanced maintenance for Asset Maintenance
2017-11-28 15:14:56 +05:30
Saurabh
b750b304dd
fixed merge-conflicts
2017-11-28 11:02:28 +05:30
Saurabh
ab5e77ecf1
[fix] do not pull disabled pos profiles ( #11733 )
2017-11-27 11:26:13 +05:30
Nabin Hait
57952f6946
Merge branch 'develop' into feature_10861
2017-11-23 16:12:55 +05:30
Nabin Hait
82027ea3bf
Set print hide property for payment terms
2017-11-23 12:49:42 +05:30
Saurabh
ed4191ec5b
[fix] merge-conflicts
2017-11-22 18:01:56 +05:30
Nabin Hait
96abfd2ab9
[fix] In payment entry, run some events serially to avoid async issue
2017-11-22 15:13:16 +05:30
Nabin Hait
32a62a02df
Fixed merge conflict
2017-11-21 20:18:03 +05:30
Nabin Hait
0551f7bb00
Cleanup and fixes of payment terms feature
2017-11-21 19:58:16 +05:30
rohitwaghchaure
179e0c1d8d
Added party name in accounts receivable/payable report ( #11656 )
2017-11-20 11:18:55 +05:30
Rohit Waghchaure
77940493a8
[fix] Price list not loaded from pos profile, auto set outstanding amount in the mode of payment
2017-11-18 19:06:31 +05:30
Zarrar
1b4894c33a
make root_type null if not root ( #11626 )
2017-11-17 14:32:12 +05:30
Rushabh Mehta
30dc9a14c6
[feature] [refactor] Shipping Rule for Buying + Refactor ( #11628 )
...
* Shipping rule for Buying
* [refactor] shipping rule
2017-11-17 14:31:09 +05:30
Saurabh
66e65dc104
[fix] merge-conflicts
2017-11-17 14:03:13 +05:30
Rohit Waghchaure
44f7b157ff
[fix] POS redirect issue
2017-11-17 13:52:11 +05:30
Nabin Hait
7fa111de45
Update sales_invoice.py
2017-11-17 12:55:08 +05:30
Nabin Hait
6b70906deb
Update purchase_invoice.py
2017-11-17 12:54:32 +05:30
Nabin Hait
1c4653ed97
Merge branch 'develop' into payment-terms
2017-11-17 12:41:56 +05:30
Nabin Hait
877e1bb377
Post GL Entry based on rounded total in Sales/Purchase Invoice ( #11542 )
2017-11-17 12:27:43 +05:30
Nabin Hait
1749b7c16b
Minor fixes related to account renaming and deletion
2017-11-16 17:49:54 +05:30
Nabin Hait
46be9896a9
Account number in chart of accounts ( #10551 )
...
* Account number in chart of accounts
* Include account number while renaming account
* Test case fixed
* Standard coa with and without numbers
* Standard coa with and without numbers
2017-11-16 16:51:55 +05:30
augustinfotech
135a54ca93
Allow print before pay in POS ( #11590 )
2017-11-16 15:28:42 +05:30
Manas Solanki
eb3982044b
convert html into text in the taxes description as it can break the reports ( #11603 )
2017-11-16 14:11:39 +05:30
Pawan Mehta
bda07c6db4
Added Warehouse, Cost Center, Owner filters to Sales Register ( #11600 )
...
* [fix] #3668
* fix codacy space issue
2017-11-16 14:09:17 +05:30
rohitwaghchaure
21cbbae88f
[fix] Payment reconcillation showing linked journal entries ( #11611 )
2017-11-16 14:05:57 +05:30
ashish
f67372cfb3
removed logic from delivery note for checking bypass credit limit flag
2017-11-16 10:58:25 +05:30
ashish
62155fa0e5
Merge branch 'feature_10861' of https://github.com/ashish-greycube/erpnext into feature_10861
2017-11-16 10:47:44 +05:30
Rushabh Mehta
d3f5d0961a
[feature] Opening Invoice Creation Tool ( #11589 )
...
* [enhance] Opening Invoice Tool create Opening Sales/Purchase Invoices
* [minor] added progress bar while creating invoice
* [minor] allow bulk upload for the invoices
* [minor] calculate item rate from net total
* [minor] added defaults for invoices fields, create gl entries only if grand_total is greater than 0
* [minor] check mandatory values before making opening invoices
* [minor] enable primary button if there is any error while creating invoices
* [minor] minor fixes, set company currency as invoice currency added tests
* [dashboard] added Opening Invoice Summery section in Dashboard
* [minor] added total invoices count on dashboard
* [minor] don't show dashboard if there are no opening invoices available
* [minor] added Opening Invoice Tools to Account's Tools section
* [minor] codecy fixes
* [fix] refactored general ledger and buttons on charts
* [fix] tests
2017-11-15 16:29:53 +05:30
Zarrar
24b8aa2e80
set field dependent on link field fix ( #11580 )
2017-11-15 14:27:00 +05:30
Nabin Hait
6fd163bc55
Merge branch 'master' into develop
2017-11-15 14:08:17 +05:30
Umair Sayed
3a9ca883b9
Update party.py ( #11584 )
2017-11-15 13:44:04 +05:30
Shreya Shah
be690ef817
Rate with margin in customer and company currency ( #11437 )
...
* field for company margin
* added base_rate_with_margin
* calculate company margin
* test for item price
* test for delivery note
* test for sales order
* test for quotation
* test for sales invoice
2017-11-14 17:22:41 +05:30
Nabin Hait
cd13a28417
Get items from quotation in sales invoice
2017-11-14 17:13:53 +05:30
AravindPranera
0ebd3c373c
Getting Quotation Document in Sales Invoice
2017-11-14 17:13:53 +05:30
tunde
ffa659fd2c
Merge branch 'develop' into payment-terms
2017-11-14 09:59:45 +01:00
Nabin Hait
ec8a0a22d7
Merge branch 'master' into develop
2017-11-13 15:10:17 +05:30
Nabin Hait
6605919ecd
GL Entries on sale of an asset ( #11538 )
2017-11-13 15:06:35 +05:30
Nabin Hait
deeb1380b1
Ignore paid credit note in outstanding invoices in Payment Entry ( #11534 )
2017-11-13 13:52:05 +05:30
Saurabh
0f86d86e27
[fix] validate party account ( #11517 )
2017-11-10 19:21:09 +05:30
Prateeksha Singh
17b7209032
remove erroneous column breaks ( #11522 )
2017-11-10 18:54:03 +05:30
Prateeksha Singh
731b66b788
remove erroneous column breaks ( #11523 )
2017-11-10 18:53:52 +05:30
Rushabh Mehta
4313326ba0
[fix] treeview for tasks ( #11515 )
...
[fix] treeview for tasks
2017-11-10 18:52:21 +05:30
Saurabh
7ab28ec562
[fix] give preference to gateway selected on shopping cart settings ( #11393 )
2017-11-10 11:17:01 +05:30
Nabin Hait
15753074bf
Nestedset model fixes for changing parent and renaming ( #11467 )
2017-11-10 11:12:43 +05:30
Nabin Hait
ff73646212
Made POS Profile mandatory and changed test order
2017-11-08 14:34:38 +05:30
Saurabh
98aa544f25
Merge branch 'master' into staging
2017-11-08 12:18:50 +05:30
Saurabh
f41b13b736
[fix] merge-conflicts
2017-11-08 12:18:41 +05:30
Sushant Nadkar
72c40f0383
Enabled track seen for Sales Order, Sales Invoice, Production Order, and Delivery Note ( #11440 )
2017-11-08 11:35:46 +05:30
rohitwaghchaure
f688af3809
[fix] Offline pos name is not defined issue in the POS ( #11469 )
2017-11-08 11:33:39 +05:30
Rohit Waghchaure
35fc45eff9
[fix] POS Profile test cases
2017-11-07 10:43:16 +05:30
Nabin Hait
e552a51266
Minor cleanups
2017-11-06 17:39:31 +05:30
pawan
436f7b980c
codacy issues
2017-11-06 17:39:31 +05:30
pawan
438dfc081b
fix codacy issues
2017-11-06 17:39:30 +05:30
pawan
d59225635d
remove old report
2017-11-06 17:39:30 +05:30
pawan
b699b86b76
Add Total Row
2017-11-06 17:39:30 +05:30
pawan
8d1d64aa29
[fix] #11449
2017-11-06 17:39:30 +05:30
pawan
e61a275651
[fix] #11427
2017-11-06 17:39:30 +05:30
rohitwaghchaure
bcb7854340
Merge pull request #10982 from netchampfaris/multiple-users-pos-profile
...
[Enhancement] Allow Multiple users in POS Profile
2017-11-06 16:45:01 +05:30
Manas Solanki
b1616a0cb3
changes in thepos profile
2017-11-06 13:53:52 +05:30
Manas Solanki
3f0dfd720f
set the pos profile in the sales invoice
2017-11-06 13:53:52 +05:30
Manas Solanki
76ce074c63
return the account details if and only if there is single account of that type ( #11407 )
2017-11-02 18:12:47 +05:30
Saurabh
62fd4007b0
Merge branch 'master' into staging
2017-11-02 12:14:42 +05:30
Saurabh
3be72ef187
Merge branch 'master' into develop
2017-11-02 12:14:41 +05:30
Rohit Waghchaure
99748dbacf
[Fix] Wrong difference amount in the payment entry for the internal transfer type
2017-11-01 11:45:02 +05:30
Faris Ansari
3d59179205
Load default pos profile if not found
2017-10-31 21:56:16 +05:30
Manas Solanki
160e710ebf
set bank account only if there is single bank type account ( #11363 )
...
* set bank account only if there is single bank type account
* Update journal_entry.py
2017-10-31 13:04:02 +05:30
Prateeksha Singh
6b26e391b8
use the new frappe charts :D ( #11391 )
2017-10-31 12:58:48 +05:30
Faris Ansari
895aa7b7ac
fix codacy
2017-10-30 17:12:50 +05:30
Faris Ansari
7095de03ef
Merge branch 'develop' into multiple-users-pos-profile
2017-10-30 15:00:55 +05:30
Faris Ansari
8c1099d236
Add POS Profile User DocType
2017-10-27 16:48:07 +05:30
ashish
ca2250c440
sales_invoice.py -- Check credit limit when make delivery is done from sales invoice.We need to check the credit limit as there could be multiple partially paid sales order(note we are bypassing credit check at sales order) so we need to recheck credit balance of customer to avoid any delivery crossing credit limit from sales invoice.cint function is added.
2017-10-26 20:22:34 +05:30
tunde
14e97ce0c8
Merge branch 'develop' into payment-terms
2017-10-26 13:35:42 +01:00
Nabin Hait
c799a22d55
Merge branch 'master' into staging
2017-10-26 14:35:34 +05:30
Nabin Hait
edef9811f9
Merge branch 'master' into develop
2017-10-26 14:35:34 +05:30
Nabin Hait
52909b73bb
[test] Fixed advance jv cancellation ( #11333 )
2017-10-26 11:06:07 +05:30
Saurabh
b445633e56
Merge branch 'master' into staging
2017-10-26 09:59:22 +05:30
Saurabh
0d597cef8d
Merge branch 'master' into develop
2017-10-26 09:59:22 +05:30
rohitwaghchaure
2e6f6d6749
[minor] cleanup code ( #11331 )
2017-10-25 17:03:49 +05:30
ashish
ff20182d03
sales_invoice.py -- Check credit limit when make delivery is done from sales invoice.We need to check the credit limit as there could be multiple partially paid sales order(note we are bypassing credit check at sales order) so we need to recheck credit balance of customer to avoid any delivery crossing credit limit from sales invoice
2017-10-25 16:11:58 +05:30
