Raghavendra Kamath
|
2afa8277a7
|
Update Readme to add new erpnext logo (#12728)
|
2018-02-01 11:53:01 +05:30 |
|
Nabin Hait
|
7ba092eaf9
|
Fixes for making stock entry against Pro Order (#12721)
|
2018-02-01 10:51:27 +05:30 |
|
Saurabh
|
f16d45b0a0
|
Merge branch 'develop' of https://github.com/frappe/erpnext into show_address_in_online_pos
Resolved Conflicts:erpnext/selling/doctype/customer/customer.json
|
2018-02-01 02:05:30 +05:30 |
|
Rushabh Mehta
|
82fa04ce32
|
Update projects.py
|
2018-01-31 22:20:14 +05:30 |
|
Saurabh
|
9f5c2002ff
|
[Mod] Removed the Dependency on Frappe PR
[Fix] Fixed a possible bug
|
2018-01-31 17:43:58 +05:30 |
|
rohitwaghchaure
|
32a5f38595
|
Merge pull request #12633 from vishdha/issue_12388
[fix] Sales order link to purchase order not working fixed
|
2018-01-31 17:30:43 +05:30 |
|
tundebabzy
|
4990cf7783
|
remove stray code
|
2018-01-31 11:35:56 +01:00 |
|
Saurabh
|
9f29f60707
|
Merge pull request #12581 from britlog/website-product-spinner
[Website] Add number spinner for quantities in product page
|
2018-01-31 15:58:04 +05:30 |
|
Nabin Hait
|
ec2c9ec897
|
Merge branch 'master' into develop
|
2018-01-31 15:39:16 +05:30 |
|
Nabin Hait
|
8f38a17c14
|
Merge branch 'hotfix'
|
2018-01-31 15:39:15 +05:30 |
|
Nabin Hait
|
bff1971bb2
|
bumped to version 10.0.18
|
2018-01-31 16:09:15 +06:00 |
|
Zarrar
|
4e05f02038
|
error in throw message rectify (#12719)
|
2018-01-31 15:33:51 +05:30 |
|
Nabin Hait
|
7918b92d95
|
Invalid date value comparison, fixes for mariadb 10.2.3+
|
2018-01-31 15:30:03 +05:30 |
|
tundebabzy
|
29c8142678
|
refactor adjust_for_expired_items and others as per code review
use get_all instead of get_list
rename `adjust_for_expired_items` to `adjust_qty_for_expired_items`
|
2018-01-31 10:51:06 +01:00 |
|
vishdha
|
df1653827f
|
[fix] Patch for material request to purchase order added
|
2018-01-31 15:11:24 +05:30 |
|
Vishal
|
fc05cc4e70
|
[fix] link with supplier quotation to purchase order
|
2018-01-31 15:10:39 +05:30 |
|
Vishal
|
4dc329f5ea
|
[fix] Sales order link to purchase order not working fixed
|
2018-01-31 15:10:39 +05:30 |
|
Nabin Hait
|
e37e5d6134
|
minor fix in patch for mariadb version
|
2018-01-31 15:00:18 +05:30 |
|
rohitwaghchaure
|
2056ea6fb4
|
Update customer.js
|
2018-01-31 14:48:53 +05:30 |
|
Zarrar
|
dea99cc3a8
|
treeview not set when routed from bom form (#12707)
|
2018-01-31 13:07:04 +05:30 |
|
Kenneth Sequeira
|
f6daf56054
|
Added Tutorial Videos for Education in User Manual (#12678)
* added erpnext education tutorial videos to the manual
* testing with div
* Update program-enrollment.md
Properly ended YouTube video.
* removed group assessment criteria page
|
2018-01-31 12:49:58 +05:30 |
|
Achilles Rasquinha
|
6ceffbd2f8
|
Merge pull request #12710 from achillesrasquinha/12704
Python 3 Compatible Fixes.
|
2018-01-31 11:23:05 +05:30 |
|
Nabin Hait
|
bc640fe6a6
|
minor fix in old patch
|
2018-01-30 19:26:28 +05:30 |
|
saurabh-bhosale
|
0c9a99a953
|
Merge branch 'develop' into show_address_in_online_pos
|
2018-01-30 17:48:12 +05:30 |
|
Achilles Rasquinha
|
39f3d7e3aa
|
local import
|
2018-01-30 16:58:49 +05:30 |
|
Nabin Hait
|
dba5e7645b
|
Minor fix in old patch
|
2018-01-30 16:38:47 +05:30 |
|
Nabin Hait
|
927d13fadb
|
Minor fix in old patch
|
2018-01-30 15:59:44 +05:30 |
|
Nabin Hait
|
0f75a022f2
|
Minor fix in old patch
|
2018-01-30 15:32:17 +05:30 |
|
Nabin Hait
|
4eae6c985c
|
Fixed test records for supplier
|
2018-01-30 15:27:29 +05:30 |
|
Nabin Hait
|
b9e8b917b6
|
Removed ui-tests from travis
|
2018-01-30 15:08:33 +05:30 |
|
Achilles Rasquinha
|
ac57c87bc3
|
Fixed spacing
|
2018-01-30 14:05:18 +05:30 |
|
Achilles Rasquinha
|
244dcae110
|
Fixed spacing
|
2018-01-30 14:03:59 +05:30 |
|
Achilles Rasquinha
|
ef58be1302
|
Fixed education string
|
2018-01-30 13:58:43 +05:30 |
|
tundebabzy
|
df50a6f828
|
Merge pull request #12705 from achillesrasquinha/12704
Fix for python 3 compatibility
|
2018-01-30 09:26:51 +01:00 |
|
system19
|
4e195d97c7
|
Minor - Healthcare Desktop UI (#12657)
* Minor - Healthcare Desktop UI
Minor - Healthcare Desktop UI
* Update desktop.py
|
2018-01-30 13:48:24 +05:30 |
|
Achilles Rasquinha
|
2862e25f3e
|
fixed python3 error
|
2018-01-30 13:47:18 +05:30 |
|
vishdha
|
1910530e41
|
[fix] CDNR negative value
|
2018-01-30 12:19:56 +05:30 |
|
tundebabzy
|
2f4854ad1a
|
create new dialog everytime (#12696)
|
2018-01-30 12:18:15 +05:30 |
|
Nabin Hait
|
585254456e
|
Check credit limit while making DN, if bypassed on SO (#12702)
|
2018-01-30 12:11:22 +05:30 |
|
vishdha
|
109b408d11
|
[fix] minor changes in gst field alignment
|
2018-01-30 12:11:13 +05:30 |
|
vishdha
|
963dd1e4bc
|
[minor] ITC data append to row
|
2018-01-30 11:51:57 +05:30 |
|
rohitwaghchaure
|
ce5b93ca77
|
[Fix] Allow user to edit rate in online POS (#12701)
|
2018-01-30 10:39:46 +05:30 |
|
vishdha
|
e03e4a581f
|
[fix] Fetch correct Tax Details
|
2018-01-29 22:55:23 +05:30 |
|
vishdha
|
98e33c31cd
|
[wip] Gstr2
|
2018-01-29 22:54:38 +05:30 |
|
Cesar
|
d8b1927e8d
|
Allow no ZERO Payment
Allow no ZERO Payment
|
2018-01-29 15:39:52 +01:00 |
|
Helkyd
|
d6a61ad0c3
|
Trial Balance sort by Account Name
Trial Balance order by Account Name
Used Sorted under Prepare_data Function.
|
2018-01-29 13:47:12 +00:00 |
|
Saurabh
|
59c915f599
|
Merge branch 'master' into develop
|
2018-01-29 18:53:54 +05:30 |
|
Saurabh
|
32c2c474fd
|
Merge branch 'hotfix'
|
2018-01-29 18:53:53 +05:30 |
|
Saurabh
|
f3d30c5bb9
|
bumped to version 10.0.17
|
2018-01-29 19:23:53 +06:00 |
|
Saurabh
|
8df20f6501
|
Merge pull request #12695 from Zlash65/fix-dn
[Hotfix] Stock entry issue
|
2018-01-29 18:52:32 +05:30 |
|