Nabin Hait
60200eaf0d
bumped to version 10.1.13
2018-03-15 13:08:41 +06:00
Nabin Hait
1e4cfb4bf5
Fixes in setting po nos manually in sales invoice
2018-03-15 12:27:24 +05:30
Nabin Hait
70abac0061
Get territory from sales invoice
2018-03-15 12:19:16 +05:30
Achilles Rasquinha
a4a62d5ea1
unordered types None vs int
2018-03-15 12:18:37 +05:30
Nabin Hait
bb5caf8fad
Merge branch 'master' into develop
2018-03-14 13:33:38 +05:30
Nabin Hait
d7f32e492f
Merge branch 'hotfix'
2018-03-14 13:33:36 +05:30
Nabin Hait
6c09297bcd
bumped to version 10.1.12
2018-03-14 14:03:36 +06:00
Nabin Hait
363cedde76
Fixed minor issue
2018-03-14 13:32:14 +05:30
Nabin Hait
d21ad807b5
Merge branch 'master' into develop
2018-03-13 18:13:44 +05:30
Nabin Hait
f5ad339cae
Merge branch 'hotfix'
2018-03-13 18:13:43 +05:30
Nabin Hait
c8c733bc54
bumped to version 10.1.11
2018-03-13 18:43:42 +06:00
Shreya Shah
7acc8cb747
fix else condition ( #13295 )
2018-03-13 18:12:19 +05:30
Nabin Hait
e01dcc170c
Merge branch 'master' into develop
2018-03-13 17:11:52 +05:30
Nabin Hait
9a398b4742
Merge branch 'hotfix'
2018-03-13 17:11:49 +05:30
Nabin Hait
56882033bf
bumped to version 10.1.10
2018-03-13 17:41:49 +06:00
Nabin Hait
74c817e7f9
Update update_reserved_qty_for_purchase_order.py
2018-03-13 17:10:14 +05:30
Nabin Hait
3707242770
Fixed merge conflict
2018-03-13 16:15:41 +05:30
Nabin Hait
d98a6d81eb
Merge branch 'hotfix'
2018-03-13 16:14:02 +05:30
Nabin Hait
baac05955b
bumped to version 10.1.9
2018-03-13 16:44:02 +06:00
Nabin Hait
89346967da
Reverted #13259 ( #13291 )
2018-03-13 16:01:11 +05:30
Nabin Hait
97e890d0b3
Fix in unallocated amount calc in payment entry ( #13288 )
2018-03-13 15:57:34 +05:30
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
9fb7e2fe04
Merge pull request #13283 from achillesrasquinha/py3
...
string_types from basestirng
2018-03-12 19:16:55 +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
3907eae83f
Merge branch 'hotfix'
2018-03-12 15:31:03 +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
71166d46f9
Merge pull request #13270 from pratu16x7/charts-fix
...
Update Charts to v1
2018-03-12 10:56: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
3dea6589d7
Merge branch 'hotfix'
2018-03-09 16:38:51 +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
