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

891 Commits

Author SHA1 Message Date
rohitwaghchaure
d45266881a [Enhance] New print format for UAE/KSA for vat/excise (#12202) 
* [Enhance] New print format for UAE/KSA for vat/excise

* Fixed spelling
 2017-12-28 14:20:13 +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.

* Revert "[fix] Column Heading in received item to be billed report (#12083)"

This reverts commit 7c57b6ecd8.

* Revert "[fix] Mobile no search issue in the pos (#12090)"

This reverts commit b725affe0c.

* Revert "[Fix] Payment terms validation issue (#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
Nabin Hait
9771b9376d Merge branch 'master' into develop 2017-12-15 12:53:56 +05:30
rohitwaghchaure
ce8adecbad Incoming rate fixes (#11986) 2017-12-15 12:13:50 +05:30
Vishal Dhayagude
d377018695 [fix] Shipping charges change on qty, item_code and conversion_factor trigger (#12001) 
* [wip] shipping rule

* [wip] Shipping Rule tax auto calculate

* [wip] Shipping Rule

* [new] Shipping charges change on different triggers

* [minor] Removed unnecessary comments

* [fix] Minor Changes in function calls
 2017-12-14 18:06:02 +05:30
Nabin Hait
aaf378e340
Validate numeric attribute value based on range defined in template (#11981) 2017-12-13 18:40:52 +05:30
Nabin Hait
0f97eda7c9 Merge branch 'master' into develop 2017-12-12 19:17:53 +05:30
Nabin Hait
af9bdfeaa3
Fixed calculation of taxes and totals if tax is entered as Actual, for Deduction or valuation (#11965) 2017-12-12 18:50:05 +05:30
rohitwaghchaure
4e17fae63b [enhance] UAE/KSA VAT/Excise implementation (#11923) 2017-12-12 14:40:52 +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
vwithv1602
78d5ccf5fc Invalid return against purchase invoice Error - Issue#11834 (#11835) 2017-12-04 11:16:34 +05:30
Nabin Hait
1b89be0c66
Fixed rounding issue in subcontracting (#11802) 2017-11-30 15:59:56 +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
tundebabzy
2a4fefc6ff Auto fetch batches based on quantity on POS (#11004) (#11767) 
* prevent premature escape when item has serial no and batch no

* fetch actual_batch_qty for item

* add available_qty to dialog

* remove expired batches from drop-down

* Update queries.py
 2017-11-29 10:53:09 +05:30
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
Saurabh
ed4191ec5b [fix] merge-conflicts 2017-11-22 18:01:56 +05:30
Nabin Hait
02ac901345 [fix] Rounding adjustment in company currency 2017-11-22 16:12:20 +05:30
rohitwaghchaure
4dc5f0efaf [Fix] Item details not fetching if item has no default bom (#11688) 2017-11-22 15:21:47 +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
Prateeksha Singh
8f43d2514c Multiple variant creation dialog (#11608) 
* Multiple variant creation dialog

* variant dialog codacy fixes

* [multiple variants] show_alert, and other minors
 2017-11-16 18:06:26 +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
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
Rushabh Mehta
d5c6416d91 [new feature] Product Configurator (via Item Quick Entry) (#11535) 
* [Feature] Item Variant Creation from Quick Entry

* [minor] formatted js

* [minor] set 3 attribute per page instead of 5 in template

* [fix] fixed codecy issue

* [fix] label translation

* [minor] changed trigger event of item template

* [fix] moved item ui tests under stock

* [UI test] added test for item attribute

* [UI test] added test for creation of item variant from quick entry

* [fix] item variant ui test fixes

* [wip]

* [cleanup] item quick entry

* [remove] tests, fixtures were missing

* [refactor] use set_only_once in item
 2017-11-14 15:27:28 +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
Saurabh
022ab63a0f [fix] query param fixes 2017-11-10 15:06:02 +05:30
Faris Ansari
99e31f97b8 set default params for paging (#11500) 2017-11-10 10:50:49 +05:30
tunde
14e97ce0c8 Merge branch 'develop' into payment-terms 2017-10-26 13:35:42 +01:00
Nabin Hait
4d22b6db30 Fixed Merge Conflict 2017-10-25 14:09:46 +05:30
Nabin Hait
82c9352d53 Update variant description based on attribute if not already there (#11302) 2017-10-25 11:46:20 +05:30
tunde
09ce68ec19 Merge branch 'develop' into payment-terms 2017-10-19 17:47:31 +01:00
Saurabh
5fa2adcca9 Merge branch 'master' into develop 2017-10-18 16:23:44 +05:30
Saurabh
a7d5f94d4a [fix] Do not append description to variant if description already exists (#11204) 2017-10-18 16:02:08 +05:30
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
d82677f1e6 Merge branch 'develop' into payment-terms 2017-10-06 02:23:45 +01:00
Nabin Hait
5a834209d0 Cleanup of PO schedule date pull requests 2017-10-05 19:51:10 +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
01b96a0e31 Fixes for uom in get_item_details 2017-09-29 18:57:41 +05:30
Nabin Hait
79a1d2a3b0 Fixes for uom in get_item_details 2017-09-29 18:15:40 +05:30
tunde
c49e748c85 Merge branch 'develop' into payment-terms 2017-09-29 13:30:22 +01:00
Rushabh Mehta
912ae24ca2 Merge branch 'master' into develop 2017-09-29 16:22:02 +05:30
Rushabh Mehta
80d24f83f8 [fix] item variant description 2017-09-29 15:39:03 +05:30
tunde
25275077ab Merge branch 'develop' into payment-terms 2017-09-29 10:47:01 +01:00
Nabin Hait
945f502748 Fixes for updating item variant from template (#10975) 
* Fixes for updating item variant from template

* More fixes for test cases
 2017-09-29 15:11:50 +05:30
tunde
3415ac6e9c Merge branch 'develop' into payment-terms 2017-09-29 10:10:24 +01:00
Nabin Hait
c314485d55 Fixes based on test case 2017-09-28 18:55:49 +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
82de375ba0 Merge branch 'develop' into payment-terms 2017-09-21 11:21:05 +01:00
Rohit Waghchaure
0e28fccb34 [Enahance] Update variants fields defined in the Item Varianst Settings, if template updated 2017-09-21 15:41:57 +05:30
tunde
3387d026b1 Merge branch 'develop' into payment-terms 2017-09-19 18:07:12 +01:00
Nabin Hait
2e4de83df6 Rounding Adjustment via a separate field, instead of last tax row (#10659) 
* Rounding Adjust via a separate field, instead of last tax row

* Fixed test cases
 2017-09-19 14:53:16 +05:30
Nabin Hait
bd4b80e3d8 Merge branch 'master' into develop 2017-09-19 12:05:41 +05:30
tundebabzy
f6d738b3c5 Delivery note to billing issue (#10726) (#10766) 
* allow invoices to be made from sales returns

* Update queries.py
 2017-09-18 17:10:09 +05:30
tunde
9448f4b13c codacy corrections 2017-09-18 12:08:34 +01:00
tunde
4bf3ed47ff revert from trying to adjust payment schedule based on old recurring_document 2017-09-18 11:54:28 +01:00
Saurabh
d7e1869a70 [fix] if item code not exists then exclude item in validate_selling_price (#10800) 2017-09-18 15:43:35 +05:30
mbauskar
ea832b8157 resolved merge conflicts 2017-09-14 15:32:10 +05:30
Nabin Hait
45dce89cae Print Settings for printing taxes with zero amount (#10782) 
* Print Settings for printing taxes with zero amount

* added __init__.py file to patch module v8_9
 2017-09-14 15:17:38 +05:30
tunde
1255aa0f11 Merge branch 'develop' into payment-terms 2017-09-12 11:54:52 +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
mbauskar
dfeadf876e Merge branch 'master' into develop 2017-09-10 12:32:21 +05:30
Makarand Bauskar
80b2ba2b9a [hotfix] fixed Not Permitted issue for System user while accessing documents on portal (#10725) 
* [hotfix] dont allow guest user to list the invoices or orders

* [hotfix] fixed Not Permitted issue for System user while accessing documents on portal

* [codecy] removed trailing whitespace

* [fixes] added filters for supplier in RFQ and other minor fixes
 2017-09-10 12:04:28 +05:30
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
a19ea6e2f3 Merge branch 'develop' of https://github.com/frappe/erpnext into payment-terms 2017-08-29 15:26:50 +01:00
Aditya Hase
6ccb6562f1 Python 3 compatibility syntax error fixes (#10519) 
* Use Python 3 style print function

* Use 'Exception as e' instead of 'Exception, e'

* Unpack tuple arguments explicitly in instead of relying on auto unpacking

* Use consistent indentation

* Use 0 if stock_frozen_upto_days is None
 2017-08-28 18:17:36 +05:30
Nabin Hait
caab582943 Tax breakup for actual amount and fixes in itemised purchase register (#10515) 
* Tax breakup for actual amount and fixes in itemised pur register

* Rounding of itemised tax breakup amount
 2017-08-24 16:22:28 +05:30
Rushabh Mehta
7e506af0b9 [fix] warehouse query fixes https://github.com/frappe/erpnext/issues/10537 (#10538) 2017-08-24 15:23:33 +05:30
tunde
f7e87e66ee do correct gl entry for debit and credit notes 2017-08-23 22:36:25 +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
mbauskar
f03afe0878 Merge branch 'master' into staging 2017-08-14 09:31:01 +05:30
mbauskar
2fa8af3b02 Merge branch 'master' into develop 2017-08-14 09:31:01 +05:30
rohitwaghchaure
2e8232e7aa [Fix] Getting an error cost center is not defined in the purchase receipt, even if it's defined in the company (#10320) 2017-08-10 11:32:59 +05:30
Doridel Cahanap
96e52be5f1 [Enhancement] Allow Sidebar Menu record search using text from Item Name of a record (#10324) 
* Search Record in Sidebar Menu Using Item Name for Order Page

* Test Case to create 2 Quotations with different Items
 2017-08-08 17:12:50 +05:30
mbauskar
ee090a9a3c Merge branch 'master' into develop 2017-08-02 18:18:14 +05:30
Makarand Bauskar
ce436b7698 [minor] set description to '' if template description is not available (#10244) 2017-08-02 18:16:53 +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