tundebabzy
637b242a34
Credit card default account should be debtors #12989 ( #13029 )
...
* allow receivable account type in mode of payment
* update `default_account` field description
2018-02-22 10:51:57 +05:30
vishdha
09d56754ea
[fix] Codacy issue
2018-02-21 16:10:09 +05:30
vishdha
e9166d7c19
[fix] Sales partner details get from sales Order and company currency details from selected company
2018-02-21 15:35:58 +05:30
vishdha
9a64d4371e
[fix] Codacy Issue
2018-02-21 15:35:58 +05:30
vishdha
d4491d361f
[new] Filter based on company:
2018-02-21 15:35:58 +05:30
vishdha
09acb779d7
[new] Leader board
2018-02-21 15:35:58 +05:30
Suraj Shetty
d3069fee4d
Daily work summary refactor ( #12944 )
...
* added daily work summary setting doctype and code to support feature
this will allow multiple setting for daily work summary
* added daily work summary setting user doctype
* made changes in daily work summary code
* [minor] entry change in hr config file
* deleted previous daily work summary settings (and its company) doctype
* removed unwanted permission check
* toggled read_only option for enabled field
* removed print statements
* add patch for the changes
* doc changes
* [minor] indentation fix
* fixed tests
* indentation fixes
* codacy issue fix
* formatting fixes
* renamed doctype
Renamed Daily Work Summary Setting to Daily Work Summary Group and did related code and doc changes
* fixed typo
* updated doc
* codacy issue fix
* [minor] renamed doctype name in json
* Renamed old doctype
* fixed indentation
* codacy fix
* indentation fix
* renamed doctype
* handled patch exception
* fixed exception
* Update daily_work_summary_group.py
* rename patch file
removed abbreviation in file name
* handled exception in patch code
* removed Unnecessary pass statement
* [minor] indentation fix
2018-02-21 15:15:43 +05:30
Zarrar
67f74414c4
disable expand_all button for BOM ( #13015 )
2018-02-21 14:46:41 +05:30
Shreya Shah
8a77a0e1e4
Add total row in all trends reports ( #13010 )
...
* total in sales order trends report
* total in all trends reports
2018-02-21 14:46:07 +05:30
Zarrar
bc5515651b
[Hotfix] Selecting create on blank field throws error ( #13014 )
...
* selecting create on blank field error fix
* error when fetching default_print_format
2018-02-21 11:13:14 +05:30
Shreya Shah
f65afac353
db_update instead of save to avoid unnecessary validations ( #13009 )
2018-02-21 11:12:04 +05:30
Charles-Henri Decultot
b8c088edb7
Transaction Log for France ( #12795 )
...
* Regional overrides for France
* Addition of tests and documentation
2018-02-21 11:07:33 +05:30
Faris Ansari
7c744acc49
Changes for Rollup ( #12924 )
...
* Changes for rollup
* remove variables.less
2018-02-20 14:21:50 +05:30
rohitwaghchaure
e2558308f6
[enhance] Production Plan ( #12160 )
...
* [enhance] Production plan
* Test cases
* Removed production planning tool
* Documentation
* Added actual qty in material request production item
* Renamed field 'Use Multilevel BOM' to 'Include Exploded Items'
2018-02-20 12:20:00 +05:30
Pawan Mehta
2fbb4923a7
item balance report ( #12983 )
...
* item balance report
* remove hard coding
* Update item_balance.json
* Update item_balance.json
Change name to "Item Balance (Simple)"
* Update item_balance.json
2018-02-20 12:17:49 +05:30
Pawan Mehta
244e235c48
Sales Payment Summary - fix for change amount ( #12981 )
...
* [fix] #12980
* apply change amount to cash
2018-02-20 12:15:10 +05:30
Shreya Shah
f718b0c0df
Currency filter in Pricing Rule ( #11776 )
...
* added currency filter
* modified files
* pull margin only if currency matches
* Renamed price to rate in pricing rule
* fetch rate only if currency matches
* rebase with develop
* rebase with develop
* patch to set currency in existing docs
* currency field mandatory in pricing rule
* modified test cases
* rebase with develop
* fixed test case
2018-02-20 11:26:46 +05:30
rohitwaghchaure
554f2de23d
Code cleanup online POS ( #12985 )
2018-02-20 11:18:01 +05:30
Vishal Dhayagude
a5003f8f5b
[minor] Balance Qty added in reorder level email notification ( #13000 )
2018-02-20 11:14:54 +05:30
tundebabzy
6c5d7986ab
Outstanding Amount not getting updated in Payment Entry #12713 ( #12975 )
...
* allow to `set_missing_ref_details` by force
* update payment entry references during submit and cancel
2018-02-19 13:11:56 +05:30
Shreya Shah
5448318146
fix total field ( #12992 )
2018-02-19 12:44:52 +05:30
Pawan Mehta
174a18399c
Added Payment Details to Sales Payment Summary Report ( #12358 )
...
* [fix] #12357
* label changes
2018-02-19 12:39:13 +05:30
Saurabh
ec23a6f0eb
[fix] section break for raw_material_details ( #12976 )
2018-02-19 11:33:11 +05:30
Achilles Rasquinha
9b74f8bd37
Update requirements.txt
2018-02-16 17:49:55 +05:30
joezsweet
16862f9051
Better handling of auto set barcode_type issue ( #12970 )
...
Get barcode_type options and check if value is included
2018-02-16 17:33:30 +05:30
Charles-Henri Decultot
894ab7a664
Braintree integration documentation ( #12775 )
...
* Braintree integration documentation
* Cleanup documentation
2018-02-16 15:16:47 +05:30
riyasrawther
d1134516c2
Warehouse wise Item Balance, Age and Value ( #12879 )
...
* Create warehouse_wise_item_balanace_age_and_value.py
* Create warehouse_wise_item_balance_age_and_value.js
* Create warehouse_wise_item_balance_age_and_value.json
* Update warehouse_wise_item_balance_age_and_value.json
* Update warehouse_wise_item_balance_age_and_value.json
* Update warehouse_wise_item_balance_age_and_value.json
* Update warehouse_wise_item_balance_age_and_value.js
* Rename warehouse_wise_item_balanace_age_and_value.py to warehouse_wise_item_balance_age_and_value.py
* Update warehouse_wise_item_balance_age_and_value.py
2018-02-16 14:53:53 +05:30
Shreya Shah
093e7e6e98
Refactor Expense Claim ( #12883 )
...
* patch for custom workflow
* deleted field approval_status
* replaced approval_status with workflow_state
* updated test cases
* validation to check expense approver
* check if workflow_state_name already exists
* fixes
* modified notifications.py
* removed field exp_approval and modified test cases
2018-02-16 14:49:39 +05:30
joezsweet
bd7c00c59e
[Hot Fix] barcode_type auto set to a wrong value ( #12957 )
...
* Fix barcode_type auto set to a wrong value
This fix a problem that arise, for some weird reason that i can't figure out, when the barcode length == 8, 9,10 or 12,13 and barcode_type is not set; barcode_type become "ean8, ean9, ean10, ean11, ean12, ean13"
* codacy fix
2018-02-16 14:47:10 +05:30
Jay Parikh
33b2614377
[Bug] Wrong Calculation of Total Weight at Purchase Invoice item for Purchasing in Different Unit (UoM) #12965 ( #12966 )
2018-02-16 14:45:40 +05:30
Zarrar
441a1e1b8a
Validate Bank name in Setup wizard on the same slide ( #12968 )
...
* validate bank name before moving on to next slide
* Update setup_wizard.js
2018-02-16 14:44:42 +05:30
Nabin Hait
b95ecd7fcd
Gstr reports ( #12940 )
...
* GSTR1 for B2B (#12296 )
* [minor] Modified GSTR1 report to identify missing GST Account in GST Settings (#12426 )
* [minor] Modified GSTR1 report to identify missing GST Account in GST Settings
* Update gstr_1.py
* GSTR1 for B2B, B2CL and B2CS (#12459 )
* [Report] GSTR - 1 CDNR Report (#12554 )
* [wip] cdnr
* [WIP] cdnr with optional data
* [wip] Export GSTR-1
* [minor] Minor changes in export
* [new] Custom field added for GST
* [fix] Minor changes in GSTR1 Report
* [minor] Minor changes in gstr1
* [fix] Codacy Fixed
* Update setup.py
* [wip] Gstr2
* [fix] Fetch correct Tax Details
* [minor] ITC data append to row
* [fix] CDNR negative value
* Cleanup and fixes on GSTR-2
* Minor fixes in gstr reports (#12848 )
* [new] B2C limit fetch from GST Settings (#12905 )
* [new] b2c limit fetch from gst setting
* [fix] Patch Added for b2c limit
* Update gstr_1.py
* Update utils.py
* Cusotm fields related GSTR2
* minor fixes
* minor fixes
* some more fixes
* Added duplicate patch and some tests as not required on develop
2018-02-16 13:19:04 +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
Vishal Dhayagude
1e0ae07bff
[fix] Validate Party in not present in Party Type ( #12910 )
...
* [fix] Validate Party in not present in Party Type
* [fix] Minor Changes
* [fix] Valid Customer and Supplier fetch
* [WIP] Allow and prevent for creating party
* [fix] minor changes
* [fix] Requested Changes
* [fix] Codacy issue
* Update opening_invoice_creation_tool.py
2018-02-16 13:13:37 +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
Shreya Shah
278af1befb
remove deprecated processing payroll video links ( #12947 )
2018-02-16 12:58:04 +05:30
rohitwaghchaure
103c4e9b92
[Fix] Incorrect rate in item-wise sales register ( #12943 )
2018-02-16 12:57:35 +05:30
Shreya Shah
f4b271a02e
Customer and Supplier link fields in Member DocType ( #12942 )
...
* added link fields customer and supplier
* fixed a typo
2018-02-16 12:56:01 +05:30
Zarrar
5a947f38ab
avoid overlap with dropdown ( #12941 )
2018-02-16 12:49:30 +05:30
Prateeksha Singh
0acb63a938
Update hub domain 💥
2018-02-16 11:07:12 +05:30
Shreya Shah
394b7a2fa3
Rename Offer Letter to Job Offer ( #12934 )
2018-02-16 10:49:34 +05:30
rohitwaghchaure
5a5f73e46a
Merge pull request #12602 from PawanMeh/fixes_8540
...
Select multiple raw material items for Sub Contract Stock Entries
2018-02-15 18:54:29 +05:30
Nabin Hait
8a562266ad
Update set_b2c_limit.py
2018-02-15 18:40:18 +05:30
Nabin Hait
0c7ce02e54
Update set_b2c_limit.py
2018-02-15 18:12:27 +05:30
Nabin Hait
44658d44c5
Update gstr_1.py
2018-02-15 17:24:15 +05:30
saurabh-bhosale
307063e64e
[Fix] Invalid Syntax in gstr_1.py ( #12946 )
...
* [Fix] Added missing parenthesis in gstr_1.py
* Minor change
2018-02-15 17:13:35 +05:30
Saurabh
82ffdd7dc6
Merge branch 'master' into develop
2018-02-15 15:17:04 +05:30
Saurabh
db6f0848e3
Merge branch 'hotfix'
2018-02-15 15:17:03 +05:30
Saurabh
ca166eaae5
bumped to version 10.0.23
2018-02-15 15:47:03 +06:00
Vishal Dhayagude
bd59a53173
[new] B2C limit fetch from GST Settings ( #12905 )
...
* [new] b2c limit fetch from gst setting
* [fix] Patch Added for b2c limit
* Update gstr_1.py
2018-02-15 14:22:11 +05:30
