Ameya Shenoy
95763bc233
Purchase Order fixes ( #13287 )
...
- Reason: If Item Code was changed in Item Master, it didn't used to reflect on the 'Purchase Order Item Supplied' and 'Purchase Reciept Item Supplied'
- Data field in 'Production Order Item Supplied' and 'Production Reciept Item Supplied' converted to Link Field.
2018-03-13 15:51:56 +05:30
Nabin Hait
96f4b22589
Set po nos in DN and SI ( #13290 )
2018-03-13 15:46:59 +05:30
Ranjith Kurungadam
369ba85499
Physician Schedule fixes ( #13284 )
...
* move button add schedule to grid
* Physician Schedule- add slots for multiple days
* fix patient image view
2018-03-13 14:50:24 +05:30
Achilles Rasquinha
cbfcb3e61d
string_types from basestirng
2018-03-12 19:15:29 +05:30
Zarrar
0702f29860
Add Ends-On field in the Lead doctype ( #13147 )
...
* add ends_on date in lead to be mapped with calendar event
* set default ends_on to 1 hour from contact_time
2018-03-12 18:49:54 +05:30
rohitwaghchaure
13460f023d
[Fix] Batch value showing as item value while making batch ( #13281 )
2018-03-12 17:20:50 +05:30
Nabin Hait
2f493731ec
Fixed merge conflict
2018-03-12 15:49:59 +05:30
Nabin Hait
04f50be306
bumped to version 10.1.8
2018-03-12 16:01:03 +06:00
Ameya Shenoy
b34ab7549a
fixed subject to task_name ( #13278 )
2018-03-12 15:24:01 +05:30
Shreya Shah
aa54d934b8
make stock qty negative ( #13276 )
2018-03-12 15:23:28 +05:30
Zarrar
c35665fa60
update physician patch fail ( #13277 )
2018-03-12 15:21:53 +05:30
Nabin Hait
2c7a6e6b43
Reserve for subcontracting ( #13195 )
...
* [fix] #8427
* review comments changes
* Validation for reserved warhouse
* code improvements
* alignment
* test case
* message changes
* default warehouse / remove validation / change sql
* fix
* patch
* Fixed merge conflict
* Fixes and cleanups of reserve qty for subcontracting
* set from_warehouse only if purchase_order and purpose found (#12398 )
* [HotFix] Validation issue for subcontract stock entry (#12127 )
* [Fix] Validation issue for subcontract stock entry
* Update stock_entry.py
* Fixes and cleanups of reserve qty for subcontracting
* patch fixed
* Reload bin in patch
* [fix] set source warehouse in stock entry for manufacture
* [fix] #8540
* code alignment
* code alignment
* Move target warehouse validation to submit
* validation code improvement
* code changes for single stock entry
* validation fix
* call make_rm_stock_entry
* remove old stock entry method/rewrite test case
* Don't set bom_no against raw materials while trasferring items for sub-contracting
* minor fix
2018-03-12 14:12:12 +05:30
Shreya Shah
58797481f0
uncheck report hide ( #13256 )
2018-03-12 13:08:01 +05:30
Kenneth Sequeira
b48557fdc6
payment terms video tutorial in videos/learn ( #13258 )
...
* payment terms video tutorial in videos/learn
* Update payment-terms.md
2018-03-12 13:07:21 +05:30
Shreya Shah
ef4c3b8e2f
add has variants in standard filter ( #13251 )
2018-03-12 11:20:49 +05:30
rohitwaghchaure
12aa4265ff
Don't allow to set negative quantity if transaction is not return entry ( #13255 )
2018-03-12 11:20:30 +05:30
Shreya Shah
69d9f51dbb
if price list not found, set default selling/ buying price list from settings ( #13259 )
2018-03-12 11:15:49 +05:30
Prateeksha Singh
9362cf37e0
[charts] update charts API
2018-03-12 09:54:56 +05:30
Nabin Hait
fd75d554d2
Payment Terms Template added in test_ignore for Company
2018-03-09 18:52:14 +05:30
Nabin Hait
5e63c265db
Fixed merge conflict
2018-03-09 17:34:39 +05:30
Nabin Hait
096d136460
bumped to version 10.1.7
2018-03-09 17:08:50 +06:00
Nabin Hait
c3889d85a1
Update shopping_cart.js
2018-03-09 16:28:25 +05:30
Achilles Rasquinha
138a4850fe
Merge pull request #13252 from achillesrasquinha/py3
...
sort by name accounts for trial balance.
2018-03-09 15:23:28 +05:30
Achilles Rasquinha
dc61c6b975
sort by name accounts
2018-03-09 15:23:08 +05:30
Achilles Rasquinha
1d7665fca1
sort by name accounts
2018-03-09 15:22:20 +05:30
Nabin Hait
052333ea63
subctracting stock entry should also be considered as consumed qty
2018-03-09 14:30:32 +05:30
Nabin Hait
0357fbc9c1
commonfied regional function for checking delete permission
2018-03-09 13:19:52 +05:30
Nabin Hait
096c05ca6f
Fixes for regional feature of Nepal
2018-03-09 13:11:00 +05:30
theopen-institute
38cbd71352
prevent deletion of sales invoices if country is nepal
2018-03-09 12:39:40 +05:30
Achilles Rasquinha
b4de7e3d07
removed has_key, used pythonic in ( #13236 )
...
* removed has_key, used pythonic in
* Update bom.py
2018-03-09 12:35:47 +05:30
Suraj Shetty
f2d28ebd6a
Data import Tool bug fix ( #13165 )
...
* fixes #13064
* commonified naming series checks
* test fixes
replaced test employee names according to naming series
2018-03-09 12:33:13 +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
Shreya Shah
aadd30d194
fetch delivery date on add-row only if item_code exists ( #13250 )
2018-03-09 12:19:35 +05:30
Zarrar
3fd634783d
[Enhance] Fetch Customer's Item code based on Customer Name or Customer Group ( #13198 )
...
* customer code can be assigned based on customer group
* improvise customer group selection
* requested changes made
2018-03-09 12:10:45 +05:30
Harsh Patel
22e6f8d4c2
Fixes for #13071 ( #13234 )
2018-03-08 16:23:59 +05:30
rohitwaghchaure
acd3479269
Bank POS transactions in bank reconciliation ( #13225 )
2018-03-08 16:22:39 +05:30
rohitwaghchaure
a32e57ae82
[Fix] Discount in offline POS is enabled even is it's disabled in POS Profile ( #13233 )
2018-03-08 16:21:13 +05:30
Ranjith Kurungadam
a3a63177a1
fix- cannot cancel consultation, remove updating age ( #13226 )
2018-03-08 16:20:22 +05:30
Achilles Rasquinha
b2f7092f9e
Merge pull request #13235 from achillesrasquinha/py3
...
removed has_key
2018-03-08 14:22:36 +05:30
Achilles Rasquinha
87dab14576
removed has_key
2018-03-08 14:21:48 +05:30
Ameya Shenoy
d2eec91b2c
indentation fix
2018-03-08 13:27:11 +05:30
Achilles Rasquinha
9efd6e80d2
fixed tabs
2018-03-08 13:20:48 +05:30
Achilles Rasquinha
987934d8ee
fixed tabs
2018-03-08 13:16:08 +05:30
Achilles Rasquinha
abd365fd90
Merge pull request #13228 from achillesrasquinha/py3
...
[FIX] filter to list
2018-03-08 13:11:58 +05:30
Achilles Rasquinha
908289d40a
[FIX] filter to list
2018-03-08 13:10:51 +05:30
Jamsheer
665b48773f
Healthcare - Patient Appointment - Service unit based scheduling and booking ( #13211 )
...
* New Document - Patient Service Unit
* Physician - schedule based on patient service unit
* Consultation - Remove validation on submit
* Consultation - Label changed from Drug Prescription to Medication
* Availability check and book appointment based on service unit, appointment invoice creation optimized
* patch fixes
* Patient Service Unit - field - overlap_appointments
* Patient Appointment - Service Unit based scheduling and booking
* Patient Appointment - issue fixed #13016 Healthcare Patient Appointment Save Button Issue - remove validation on save and enable save on book appointment
* Codacy fixes on PR #13211
* Codacy fixes on PR #13211
* Fee validity test -fixes
* Fee Validity - test - fixes
2018-03-08 13:08:35 +05:30
Achilles Rasquinha
11241044b2
Merge pull request #13227 from achillesrasquinha/py3
...
[FIX] use text_type instead of unicode, use cmp from past.builtins
2018-03-08 12:58:21 +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
theopen-institute
1bfa243190
fix patch that causes error on bench update ( #13222 )
2018-03-08 11:20:40 +05:30
lasalesi
470977fa13
corrected setup wizard tax rates for Switzerland 2018 ( #13220 ) ( #13221 )
2018-03-08 11:19:56 +05:30
tundebabzy
1643cce479
fetch journal entry details ( #13218 )
2018-03-08 11:17:17 +05:30
Manas Solanki
bb42e3b411
Merge pull request #13214 from manassolanki/assessment-report-fix
...
minor fix for key error in assessment reports
2018-03-07 16:30:35 +05:30
Manas Solanki
586e9400b1
minor fix for key error
2018-03-07 16:28:21 +05:30
Shreya Shah
c3bf1fa009
[Fixes] Chapter DocType ( #13213 )
...
* fetch chapter head from member doctype instead of user
* add enabled in grid view and set default as 1
2018-03-07 16:27:30 +05:30
rohitwaghchaure
bbd9b71547
Provision to include exploded items while making transfer entry of raw materials for subcontrtacted item ( #13043 )
2018-03-07 15:39:40 +05:30
Vishal Dhayagude
668ec25d19
Allow Item variant Rename ( #13161 )
...
* [WIP] Item varient rename
* [wip] Item Variant
* [fix] Item Varient Rename
* [fix] Item Attribution Rename
* removed unwanted code
2018-03-07 15:31:08 +05:30
Nabin Hait
c50d7446b5
Merge branch 'master' into develop
2018-03-07 13:09:07 +05:30
Nabin Hait
36b4faab48
bumped to version 10.1.6
2018-03-07 13:39:05 +06:00
Saurabh
2b59a851c4
Merge pull request #13166 from saurabh6790/patches_fixes
...
[fix] use join instead of subquery
2018-03-07 12:59:03 +05:30
Manas Solanki
857d4f7a0b
Merge pull request #13209 from manassolanki/guardian-fix
...
allow renaming of the guardian
2018-03-07 12:53:40 +05:30
Manas Solanki
12d7bfb658
allow renaming of the guardian
2018-03-07 12:52:31 +05:30
Raghavendra Kamath
6193b92b70
Add new logo in splash image and optimise pngs ( #13206 )
2018-03-07 12:39:38 +05:30
Saurabh
ca6e223694
[fix] use join instead of subquery
2018-03-07 12:13:32 +05:30
rohitwaghchaure
343ba85e3a
Merge pull request #13203 from saurabh6790/pe_fix
...
[fix] setup_party_account_field on init
2018-03-07 12:11:46 +05:30
Manas Solanki
1fa992564a
fix the desktop icon for course schedule
2018-03-07 12:08:52 +05:30
Saurabh
a65b28772f
[fix] setup_party_account_field on init
2018-03-06 18:22:01 +05:30
Achilles Rasquinha
78064b7a45
Update patches.txt
2018-03-05 17:53:23 +05:30
Nabin Hait
c43c95e0aa
Fixed merge conflict
2018-03-05 14:54:44 +05:30
Nabin Hait
491ce05b8d
bumped to version 10.1.5
2018-03-05 15:17:18 +06:00
Saurabh
2cfcbf933d
Patches fixes ( #13163 )
...
* [fix] if serialised items not found then return
* [fix] unicode encoding in patch
2018-03-05 13:01:15 +05:30
Zarrar
2550180a05
remove updating territory for customers on change ( #13162 )
2018-03-05 12:32:41 +05:30
Zarrar
950fff0ba1
changes according to the workflow ( #13160 )
2018-03-05 11:30:53 +05:30
Manas Solanki
5fd7b3bb80
Fix status updater ( #13033 )
...
* fix the status updater for multiple sources
* patch for updating the status
* patch for updating the sales order item
* Update update_status_for_multiple_source_in_po.py
2018-03-05 11:28:29 +05:30
Vishal Dhayagude
35b665cb26
[new] Create multiple warehouse address and fetch address to stock entry ( #13109 )
...
* [new] Create multiple warehouse address and fetch address to stock entry
* [fix] Deleted unwanted field and added patch to link warehouse details to Address
* [fix] Codacy fixed
* [fix] Modified patch for warehouse address
* [fix] Modified patch for warehouse address
* [fix] Patch updated and removed contact details from stock entry
* [fix] Patch Updated
2018-03-05 11:10:01 +05:30
Zarrar
4417cb0006
improve multiple add dialog, populate parent's depends on with child tasks ( #13142 )
2018-03-05 11:08:15 +05:30
Kenneth Sequeira
89795c3f69
Doc imp ( #13148 )
...
* added intro, item and prices video, fixed image links in item and prices
* update 2: first 5 videos added
* added all videos to the user manual
* updated .gitignore
2018-03-05 11:06:44 +05:30
Zarrar
1e4e004667
leave application assigned by naming_series ( #13158 )
2018-03-05 11:05:59 +05:30
rohitwaghchaure
a6a4e86dc8
[Fix] System only shows 20 attribute values while making variants ( #13155 )
2018-03-05 11:03:59 +05:30
rohitwaghchaure
0eb8bb2511
[Fix] Wrong salary slips showing when click on view salary slips from payroll entry ( #13152 )
2018-03-05 11:03:27 +05:30
rohitwaghchaure
67cfa81de2
[Fix] Stock Ageing report does not work with group warehouse ( #13151 )
2018-03-05 11:00:42 +05:30
rohitwaghchaure
a942722619
[Fix] Timeout issue while saving multilevel BOM ( #13118 )
2018-03-01 13:15:25 +05:30
Nabin Hait
c10bbd6aa7
Editable unallocated amount in pe ( #13130 )
...
* editable unallocated amount in payment entry to handle multi currency
* set unallocated amount on server side
* some minor fixes
* Fixes in territory patch
* removed print
* minor fixes
2018-03-01 13:14:14 +05:30
Rohit Waghchaure
855d843e55
[Fix] Sales invoice email prompt not working
2018-03-01 13:06:01 +05:30
Harsh Patel
5bebbbe7a9
[Feature] Supplier warehouse link field on purchase order ( #13051 )
...
* Multiple Features:
[New] Supplier warehouse link field on purchase order for sub-contracting
[New] Auto select supplier warehouse while making purchase receipt from purchase order
* Set default to_warehouse in stock entry as the supplier warehouse
2018-03-01 11:33:25 +05:30
rohitwaghchaure
0df95fa781
Multi-UOM for sales/purchase return ( #13132 )
...
* Multi-UOM for sales/purchase return
* Update sales_and_purchase_return.py
2018-03-01 11:31:33 +05:30
Charles-Henri Decultot
bc7a549fdb
Gocardless integration ( #13008 )
...
* GoCardless integration
* Addition of a method for determining if the email should be sent or not
* Correction for Tests
* Codacy fix
* Documents moved to ERPNext
* Codacy fix
* Codacy fixes
* Remove method where not necessary and replace with hasattr
2018-03-01 10:59:21 +05:30
Zarrar
6578bc11b6
wrong query formed to delete events ( #13119 )
2018-03-01 10:54:55 +05:30
Nabin Hait
f68dc69078
Set auto created serial nos in incoming transactions in case of multi UOM ( #13112 )
...
* Create user from Employee
* Set auto created serial nos in incoming transactions in case of multi uom
2018-03-01 10:54:24 +05:30
tundebabzy
3fecbb98c5
Make Expense Claim from Employee Advance #13053 ( #13074 )
...
* allow to make expense claim from employee advance
* make expense claim only if claimed amount < paid_amount
* expense claim made from employee advance is paid
2018-03-01 10:50:45 +05:30
Zarrar
502af4dd67
display image fnd description for root BOM also ( #13099 )
2018-03-01 10:44:47 +05:30
rohitwaghchaure
db9fa78ee8
Do not validate payment schedule for POS ( #13115 )
2018-03-01 10:32:29 +05:30
Nabin Hait
a645f36b2b
Get valuation rate from historical SLE even if it is zero ( #13129 )
...
* Don't overwrite start and end date comes from payroll entry
* Get valuation rate from historical SLE even if it is zero, if records exists
* Valid till should be autoset if not any default value
* Set status of expense claim based on is_paid check
2018-03-01 10:31:24 +05:30
rohitwaghchaure
332a17ee86
[Fix] Test case for serial no ( #13136 )
2018-03-01 10:28:04 +05:30
Achilles Rasquinha
646522886c
self.assertEqual
2018-02-28 21:13:51 +05:30
Shreya Shah
a310cc7156
order by modified instead of item name ( #13113 )
2018-02-28 18:59:55 +05:30
Ameya Shenoy
c20901443e
updated develop_version to 11 ( #13133 )
2018-02-28 17:38:23 +05:30
Achilles Rasquinha
96698c9a77
Use range instead xrange ( #13128 )
...
* Use range instead of xrange
* convert float to int
2018-02-28 16:12:51 +05:30
Faris Ansari
72d8509b3d
python 3 fix ( #13127 )
2018-02-28 12:53:34 +05:30
Achilles Rasquinha
11a5f78d3e
Merge pull request #13070 from achillesrasquinha/py3
...
[FIX] sorting multiple compares
2018-02-27 19:48:25 +05:30
Nabin Hait
3b43c0d160
Update territory and customer_group patch optimization ( #13076 )
...
* Update territory and customer_group patch optimization
* Update update_territory_and_customer_group.py
2018-02-27 15:57:14 +05:30
