Shreya
14bd43d5eb
minor changes
2018-04-30 15:30:42 +05:30
Saurabh
63590496c1
[fix] resolved merge conflicts
2018-04-25 11:32:54 +05:30
rohitwaghchaure
57914f140e
[HotFix] Taxes not adding in POS sales invoice ( #13776 )
2018-04-24 19:19:47 +05:30
Nabin Hait
2b682c82e8
Fixed merge conflict
2018-04-04 11:40:16 +05:30
Manas Solanki
a7f5589564
fix for the update button in the sales invoice ( #13435 )
2018-04-02 10:32:00 +05:30
tundebabzy
e69747ca6d
[Feature Request] Add Payment Mode field on Payment Terms Template #13117 ( #13243 )
...
* add mode of payment field to Payment Term
* add mode of payment field to Payment Terms Template Detail
* add mode of payment field to Payment Schedule
* add mode of payment in `get_payment_term_details`
2018-03-09 12:23:53 +05:30
Achilles Rasquinha
9050998e06
[FIX] use text_type instead of unicode, use cmp from past.builtins
2018-03-08 12:55:41 +05:30
Nabin Hait
c43c95e0aa
Fixed merge conflict
2018-03-05 14:54:44 +05:30
rohitwaghchaure
db9fa78ee8
Do not validate payment schedule for POS ( #13115 )
2018-03-01 10:32:29 +05:30
Nabin Hait
cf72d7f135
Fixed merge conflict
2018-02-22 14:47:26 +05:30
Nabin Hait
cc98d40ff7
Payment reco auto allocation and maintain same order of records ( #12963 )
...
* Automatically allocate amount after selecting invoice against a payment entry
* codacy fixes
2018-02-16 13:14:20 +05:30
Shreya Shah
3a9eec2e92
Calculate due date in Purchase Invoice on the basis of Supplier invoice date ( #12913 )
...
* pass bill_date as parameter and calculate due_date on that basis
* calculate payment_schedule on the basis of bill_date if present else posting_date
* add bill_date as an argument to get_party_details
* pass bill_date on supplier trigger in purchase invoice
2018-02-16 13:05:21 +05:30
Nabin Hait
e21e59614f
Fixed merge conflict
2018-02-12 15:59:55 +05:30
joezsweet
2f7ab065fb
- removed barcodes from force_item_fields
2018-02-05 11:54:32 +01:00
Nabin Hait
cfa9d1adb7
Patch: Create Payment Terms based on default credit days set in company and use it while setting due_date ( #12685 )
...
* Patch: Create Payment Terms based on default credit days set in company and use it while setting due_date
* Payment Terms patch for credit days defined in customer group
2018-01-29 16:07:21 +05:30
Shreya
a137fe82a1
fix error message
2018-01-23 11:00:58 +05:30
rohitwaghchaure
da941af687
Set due date in purchase invoice based on suppler invoice date ( #12395 )
2018-01-17 16:23:04 +05:30
Nabin Hait
a2426fcc9e
Get default tax template only if tax template not selected or template is for other company ( #12492 )
2018-01-15 17:45:46 +05:30
tundebabzy
76dddbf26e
Merge branch 'develop' into multi-barcode
2018-01-10 21:49:27 +01:00
rohitwaghchaure
bf4c114c58
[Enhance] Provision to show inclusive tax in print ( #12345 )
...
* [Enhance] Provision to show inclusive tax in print
* POS Print format
2018-01-08 15:20:15 +05:30
Nabin Hait
e591c85f7c
Payment schedule total amount validation considering write off amount
2017-12-21 11:47:08 +05:30
Nabin Hait
2f9f4f9c01
Multiple fixes related to payment terms ( #12115 )
2017-12-20 12:24:59 +05:30
tundebabzy
dbd068c44b
Sales Order With Payment Terms Not Split In Payment Entry #12051 ( #12065 )
...
* validate schedule dates in non-invoice documents
* change query for orders
* take care of orders with/without payment schedule
* clean up, refactor, PEP8
2017-12-19 14:36:39 +05:30
tundebabzy
5825dedf7c
Payment schedule error #12057 ( #12096 )
...
* use 12 places precision for sums
* use high float precision, fix decimal place late
* Update accounts_controller.py
2017-12-19 11:39:20 +05:30
Nabin Hait
f592f2c9a9
Revert "[Fix] Payment terms validation issue" ( #12098 )
...
* Revert "test fixed (#12094 )"
This reverts commit dd700a550f#12083 )"
This reverts commit 7c57b6ecd8#12090 )"
This reverts commit b725affe0c#12092 )"
This reverts commit 9b8e1cb10e
2017-12-19 11:31:34 +05:30
rohitwaghchaure
9b8e1cb10e
[Fix] Payment terms validation issue ( #12092 )
2017-12-19 11:20:29 +05:30
rohitwaghchaure
efbc0667ec
[fix] On change of payment terms template, not fetch respective schedule data ( #11928 )
2017-12-11 14:54:20 +05:30
rohitwaghchaure
505661b5c0
[fix] Wrong company's default tax fetch ( #11927 )
2017-12-11 14:52:28 +05:30
Giovanni
2144e02d3c
- Added multiple barcode feature per item
2017-12-10 17:27:09 +01:00
Rohit Waghchaure
52bf56d415
[fix] payment terms test case
2017-11-27 11:43:52 +05:30
rohitwaghchaure
373b5702a9
[fix] Server test cases ( #11727 )
2017-11-27 11:27:28 +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
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
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
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
tunde
ffa659fd2c
Merge branch 'develop' into payment-terms
2017-11-14 09:59:45 +01:00
Rushabh Mehta
98aa581864
[fix] default tax only on insert ( #11544 )
...
* [fix] default tax only on insert
* [fix] default tax only on insert
* [fix] default tax only on insert
2017-11-14 09:32:32 +05:30
tunde
09ce68ec19
Merge branch 'develop' into payment-terms
2017-10-19 17:47:31 +01:00
Rushabh Mehta
bc4e2cd9c1
[added] hospitality domain ( #11020 )
...
* [added] hospitality domain
* [tests] wip
* [tests] for restaurant
* [fix] tests for new naming
* [docs] added restaurant docs
* [docs] added restaurant docs
2017-10-17 12:30:34 +05:30
tunde
19e63b73ed
Merge branch 'develop' into payment-terms
2017-10-03 12:02:38 +01:00
Nabin Hait
7eba1a35d3
Controller init args fix ( #11015 )
...
* Controller init args fix
* cleanup useless code
2017-10-02 15:59:27 +05:30
Nabin Hait
79a1d2a3b0
Fixes for uom in get_item_details
2017-09-29 18:15:40 +05:30
tunde
9bed2de726
show all duplicate rows after checking for duplicate due date
2017-09-25 10:19:35 +01:00
tunde
e52bb825ec
fix bug: form is always dirty
2017-09-25 09:02:23 +01:00
tunde
77ecacc379
validation to check for possible duplicate payment terms
2017-09-22 23:12:55 +01:00
tunde
3aec78b472
make due date, invoice_portion mandatory
2017-09-22 16:22:15 +01:00
tunde
62af5c5693
more validation checks and test fixes
2017-09-22 15:16:38 +01:00
tunde
4bf3ed47ff
revert from trying to adjust payment schedule based on old recurring_document
2017-09-18 11:54:28 +01:00
tunde
ecb118fb3b
bugfix: call set_payment_schedule only in relevant doc
2017-09-11 15:45:10 +01:00
tunde
df3a175974
fix bugs: add payment_schedule if payment_terms_schedule specified
2017-09-11 11:02:57 +01:00
tunde
96b8f223fd
fix failing tests
2017-09-08 15:35:59 +01:00
tunde
ad7d3a1733
Merge branch 'develop' into payment-terms
2017-09-07 13:13:59 +01:00
rohitwaghchaure
166b78f022
[Enhance] Subscription module ( #10089 )
...
* [Enhance] Subscription module
* Added view documents from the subscription form
* Test cases
* documentation
* UI Test cases, fixes
* Removed child table in the subscription
* Provision to make subscription from the document, added subscription in the dashboard for the sales and buying flow
* added patch to make subscription from the recurring data
* Rename field subscriptio to subscription_id, added new test cases, remove recurring_document from controller
* renamed subscription_id to subscription
2017-09-07 16:14:22 +05:30
tunde
32aa7c1e68
Automatically set payment schedule if not specified
...
- fix failing test cases
- fix failing tests for recurring documents
- others
2017-09-07 06:52:15 +01:00
tunde
fb144303f5
codacy and typo fixes
2017-08-20 17:23:55 +01:00
tunde
be1b871c53
modify validation if doc has payment term schedule
2017-08-20 17:22:59 +01:00
tunde
4c5efa3dec
renames set_payment_schedule and removes it from validation
2017-08-20 17:22:06 +01:00
tunde
43870aa8db
moves set_payment_schedule and validate_payment_schedule to accounts_controller
2017-08-20 16:56:43 +01:00
Nabin Hait
9275969b51
Payment Terms: doctypes, schedule, payments and more
...
fix payment terms template setup:
- add_fetch to correct credit_days and credit_months not credit_days_months
fixed bug in `make_customer_gl_entry` and `make_supplier_entry:
all sales invoice were failing because they were all attempting to
make gl entry from payment schedule. Same with purchase invoices
2017-08-20 16:51:29 +01:00
Nabin Hait
f37d43d0c1
Remove newline from serial no values
2017-07-18 12:15:16 +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
Nabin Hait
83f8344e62
Merge branch 'master' of github.com:frappe/erpnext into hotfix
2017-05-18 14:06:37 +05:30
Nabin Hait
ee59ecd396
Merge branch 'hotfix' of github.com:frappe/erpnext into hotfix
2017-05-18 14:06:06 +05:30
mbauskar
8f3cc81302
[minor] minor fixes in pricing_rule and set_missing_value
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
Rohit Waghchaure
dc981dc546
[fix] Auto serial no fecthed on the invoice even if stock update is disabled issue
2017-04-17 17:31:32 +05:30
Rushabh Mehta
cc8b2b2fdb
[fix] [refactor] demo for v8 and remove purchase common
2017-03-31 17:36:48 +05:30
Umair Sayyed
024896d806
updated erpnext-learn pages
2017-03-17 12:55:01 +05:30
Rushabh Mehta
6695830f3f
[fix] warehouse test cases
2017-01-16 16:57:53 +05:30
Nabin Hait
9784d27317
Optimization to reduce GLE reposting time for future stock transactions
2016-12-30 16:21:35 +05:30
Nabin Hait
ad4f1c7fd1
date is optional in get_exchange_rate
2016-12-09 12:14:47 +05:30
Nabin Hait
3113f00c46
Replaced spaces with tabs
2016-12-08 15:42:44 +05:30
Nabin Hait
288a18e0cc
Fixes and patch for Currency Exchange based on date
2016-12-08 15:36:23 +05:30
Nabin Hait
1cc55fbbcb
Fixed merge conflict
2016-12-08 14:09:23 +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
KanchanChauhan
49a50fef63
Group same item in SO print ( #6959 )
2016-11-18 13:57:53 +05:30
Nabin Hait
c9b6a07732
[fix] Remove recurring id on amendment only if it is same as amended_from
2016-11-16 18:43:44 +05:30
Rohit Waghchaure
2f1db57fe1
Added status field in sales invoice and purchase invoice
2016-11-08 18:49:58 +05:30
Rohit Waghchaure
7d5298997b
Documentation for payments
2016-10-06 16:49:39 +05:30
Nabin Hait
cccc45edc5
Don't throw expense account validation on fetching item details
2016-10-05 17:15:53 +05:30
Chude Osiegbu
256ec170d0
Corrections properly distinguish between transaction_date and posting_date as the basis for determining translation date that is passed to get_exchange_rate
2016-09-19 03:53:37 +01:00
Chude Osiegbu
1f64f9897c
Additional corrections for cases where get_exchange_rate was not called with the correct number of arguments.
2016-09-19 01:34:49 +01:00
Chude Osiegbu
7e74fb4357
Modification to set_price_list_currency in accounts_controller.py to allow for specification of date in get_exchange_rate call
2016-09-19 00:59:25 +01:00
Nabin Hait
ca627fb806
[fix] Fetch advance journal entry in invoice if it is tagged against linked order
2016-09-05 16:17:08 +05:30
Rushabh Mehta
ea0ff23891
[cleanup] form dashboards
2016-07-07 14:28:05 +05:30
Nabin Hait
ff2f3ef1b1
Test Case Fixes
2016-07-04 11:42:25 +05:30
Nabin Hait
9db1b223da
Payment Entry: Test cases and default remarks
2016-07-04 11:42:24 +05:30
Nabin Hait
13093b4b68
Make payment entry aginst order, payment request and patch to rename advance table fields
2016-07-04 11:42:24 +05:30
Nabin Hait
05aefbbf5d
Payment Entry from invoice
2016-07-04 11:42:24 +05:30
Nabin Hait
1991c7b17d
Payment Reconciliation changes for Payment Entry
2016-07-04 11:42:24 +05:30
Nabin Hait
28a0528ae4
Advance Payment Entry adjustment against Invoice
2016-07-04 11:42:04 +05:30
Nabin Hait
e3a10170f7
Payment Entry submission and more
2016-07-04 11:41:24 +05:30
Nabin Hait
12e2a51519
[new][feature] Payment Entry
2016-07-04 11:41:24 +05:30
Rushabh Mehta
2cb7a9f235
[ux] taxes table editable
2016-06-15 16:45:03 +05:30
Nabin Hait
591a5aba56
Added Project in GL Entry and General Ledger report
2016-05-26 17:51:20 +05:30
Rohit Waghchaure
5d97d89a03
[Fix] Sales Invoice shows default date while no default mentioned
2016-05-17 15:13:17 +05:30
Rohit Waghchaure
6087fe178e
[Enhancement] POS
2016-05-09 23:36:15 +05:30
Nabin Hait
cd0e8ce8ad
Fixes and modification in fixed asset
2016-04-20 17:57:12 +05:30
Nabin Hait
3d9c5c0c20
Fixed Asset module cleanup and fixes
2016-04-20 17:57:11 +05:30
Nabin Hait
14aa9c5320
[fix] Cleanup and fixes in update stock feature in Purchase Invoice
2016-04-18 16:59:47 +05:30
Nabin Hait
ffd1e4efe6
Removed db_set from inside validate
2016-04-18 15:58:44 +05:30
Saurabh
e29248bcb3
[fixes] test-case to validate quantity after update stock and purchase return and code-cleaning
2016-04-18 15:58:43 +05:30
Saurabh
43520f93a1
[fixes] test cases, code cleanup.
2016-04-18 15:58:42 +05:30
Nabin Hait
2ed0b59747
[fix] Added overlap validation in fiscal year
2016-03-31 12:40:37 +05:30
Nabin Hait
e8e2d406b5
minor fix
2016-03-29 18:17:03 +05:30
Nabin Hait
4fdb05228d
fixed asset depreciation
2016-03-29 11:54:37 +05:30
Rushabh Mehta
d3fdbaa261
Merge pull request #5041 from nabinhait/recurring_doc_amend
...
[fix] Reset recurring id on amendment
2016-03-28 18:29:44 +05:30
mbauskar
a52472cf5b
[fixes] added fields in SI and DN, moved the margin calculation to to pricing_rule.py
2016-03-24 14:07:51 +05:30
mbauskar
46c97c6e95
[fix] discount percentage fix
2016-03-24 14:07:50 +05:30
mbauskar
c97becbd15
added document type in args
2016-03-24 14:07:49 +05:30
Nabin Hait
7504ea7033
[fix] Reset recurring id on amendment
2016-03-23 12:07:34 +05:30
Nabin Hait
5996b2f1bb
[fix] recurring document logic
2016-03-18 15:19:54 +05:30
rohitwaghchaure
90ff509f6d
[fix]Earlier recurring billing
2016-03-18 10:44:53 +05:30
Valmik Jangla
c7e774fda9
BudgetError Fix
2016-03-11 13:05:20 +05:30
Valmik Jangla
319bbad4d4
Removed from Stock Entry
2016-03-11 13:05:19 +05:30
Nabin Hait
fa413bbab2
Update accounts_controller.py
2016-02-18 18:23:31 +05:30
Nabin Hait
67f40775ff
Update accounts_controller.py
2016-02-18 17:10:42 +05:30
Revant Nandgaonkar
78a62fe123
change args of set_balance_in_account_currency
...
https://github.com/frappe/erpnext/pull/4832
2016-02-18 16:48:35 +05:30
Revant Nandgaonkar
5da941b82c
Need to use set_balance_in_account_currency
...
b9ad5178e4
2016-02-18 16:02:05 +05:30
Anand Doshi
7c0a58ac3f
[fix] show formatted currency value in advance paid validation
2016-01-29 12:16:24 +05:30
Nabin Hait
b2206d1155
[fix] Multi currency advance payment against Order
2016-01-27 15:43:24 +05:30
shreyas
eba9ca4d66
[Minor]Change to maintain args ordering convention
2016-01-26 16:29:26 +05:30
shreyas
f76853a8d9
[Minor]Changed CustomerDisabled and CustomerFrozen to PartyDisabled and PartyFrozen
2016-01-25 21:25:11 +05:30
shreyas
29b565fdf5
Added Disabled field to Supplier and Customer doctype
...
Frozen field is moved to More Information section for Customer and Supplier. Any Supplier/Customer which is disabled will not be shown while creating PO/SO
2016-01-25 18:19:13 +05:30
Anand Doshi
39e2c2bb09
[fix] obey no_copy while creating recurring documents
2016-01-25 17:03:50 +05:30
Nabin Hait
34d2822483
Fixes in get_item_details and test cases
2016-01-19 16:48:32 +05:30
Rushabh Mehta
b46069d44b
[cleanup] contextual buttons in sales & purchase and fix rate setting in opp -> quotation and material request -> purchase order
2016-01-15 16:59:26 +05:30
Nabin Hait
ddc295b4b3
[minor] Set expense account as Stock RBNB for perpetual inventory after mapping
2015-11-30 18:40:28 +05:30
Anand Doshi
602e8253be
[enhancement] Int, Currency, Float, Percent as not null and default to 0
2015-11-19 13:23:36 +05:30
Anand Doshi
d8bc40d7f0
[fix] party gle currency validation
2015-10-22 17:55:22 +05:30
Nabin Hait
0045c305ac
Period Closing Voucher as per multi currency
2015-10-22 16:21:37 +05:30
Anand Doshi
7afaeb0820
[fix] the case when party account currency is missing
2015-10-01 18:55:43 +05:30
Anand Doshi
4945b94950
[fix] added validation to match account currency with existing gle and test case
2015-09-30 16:41:15 +05:30
Anand Doshi
cd0989e051
Added method get_account_currency
2015-09-30 15:11:12 +05:30
Anand Doshi
b20baf894f
[fix] Remove party_account_currency from Customer and Supplier, and use currency derived from get_party_account
2015-09-30 15:11:12 +05:30
Rushabh Mehta
72b1128467
[fixes] accounts controller add flt
2015-09-28 17:29:46 +05:30
Anand Doshi
53a0de7607
[fix] Recalculate rate after applying Pricing Rule
2015-09-22 15:26:53 +05:30
Anand Doshi
be6cfddc4d
[hotfix] multicurrency gl entry
2015-09-17 21:07:04 +05:30
Anand Doshi
bf8c8df9ce
Revert "[hotfix] set_balance_in_account_currency"
...
This reverts commit 9acd6a2629
2015-09-17 20:55:50 +05:30
Anand Doshi
9acd6a2629
[hotfix] set_balance_in_account_currency
2015-09-17 20:29:31 +05:30
Anand Doshi
979326b0b1
minor fixes in multi-currency
2015-09-11 16:33:45 +05:30
Nabin Hait
e3ae05aabd
Multi-currency: Exchange Rate in Journal Entry
2015-09-09 18:43:12 +05:30
Nabin Hait
98096771c2
[multi currency] Introduced Accounting Currency in Customer and Supplier, and validation according to that
2015-09-03 10:28:08 +05:30
Nabin Hait
6e439a5e53
Multi currency: test case and fixes
2015-08-28 19:24:22 +05:30
Nabin Hait
4ffd7f3d05
Outstanding, paid and write-off amount in Invoice
2015-08-27 12:28:36 +05:30
Nabin Hait
895029dc15
Validate currency in transactions
2015-08-21 14:31:47 +05:30
Nabin Hait
c561a499d7
Multi currency GL entry fixes
2015-08-21 14:31:47 +05:30
