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 |
|
Achilles Rasquinha
|
0bf19a1ac5
|
Merge pull request #12931 from achillesrasquinha/py3-iteritems
Py3 iteritems
|
2018-02-15 13:49:43 +05:30 |
|
Achilles Rasquinha
|
c94df80d88
|
Merge pull request #12925 from netchampfaris/enable-translatable-patch
Patch to enable translatable
|
2018-02-15 12:18:26 +05:30 |
|
Achilles Rasquinha
|
d56b00f5fd
|
Merge pull request #12932 from achillesrasquinha/py3-basestring
Py3 basestring
|
2018-02-15 12:16:12 +05:30 |
|
Achilles Rasquinha
|
dd8e1ff5ba
|
Merge pull request #12930 from achillesrasquinha/py3-fixes
Py3 fixes
|
2018-02-15 12:15:56 +05:30 |
|
Achilles Rasquinha
|
5f0c70361a
|
iteritems
|
2018-02-15 11:55:45 +05:30 |
|
Achilles Rasquinha
|
1697a7aa81
|
replaced string_types with basestring
|
2018-02-15 11:39:45 +05:30 |
|
Achilles Rasquinha
|
714c7465fb
|
Updated Python 3 fixes
|
2018-02-15 11:31:05 +05:30 |
|
Shreya Shah
|
8b531c1ee6
|
Fix parenthesis in buying controller (#12923)
|
2018-02-15 11:21:49 +05:30 |
|
Prateeksha Singh
|
387a242232
|
Merge pull request #12928 from pratu16x7/hub-pages
Hub pages
|
2018-02-15 11:05:22 +05:30 |
|
Prateeksha Singh
|
9889899603
|
[hub] cleanups
|
2018-02-15 10:54:23 +05:30 |
|
Prateeksha Singh
|
1ad072f2a9
|
[hub] cleanups
|
2018-02-15 10:47:59 +05:30 |
|
Prateeksha Singh
|
2073959bb8
|
Update entity properties
|
2018-02-15 10:24:16 +05:30 |
|
Prateeksha Singh
|
6ee035ba5b
|
tree parent working
|
2018-02-15 08:50:31 +05:30 |
|
Faris Ansari
|
1e422f2383
|
Patch to enable translatable
|
2018-02-14 22:18:55 +05:30 |
|
Prateeksha Singh
|
25d5a1d890
|
add company pages
|
2018-02-14 19:53:18 +05:30 |
|
Achilles Rasquinha
|
806a18b511
|
Merge branch 'develop' of https://github.com/frappe/erpnext into develop
|
2018-02-14 19:40:43 +05:30 |
|
Nabin Hait
|
e6d65bc2a1
|
Fixed translations and tests (#12900)
* Fixed translations and tests
* minor fixes
* minor test fixes
|
2018-02-14 17:44:06 +05:30 |
|
Achilles Rasquinha
|
361366ebe6
|
Python 3 fixes. (#12916)
* Fixed iteritems and exceptions
* python3-fixes
* fixed iteritems
|
2018-02-14 17:08:59 +05:30 |
|
rohitwaghchaure
|
a13b177908
|
[Fix] Not able to select delivery note in delivery trip (#12912)
|
2018-02-14 17:06:21 +05:30 |
|
Prateeksha Singh
|
8e84fa9f9e
|
Merge pull request #12914 from achillesrasquinha/company-logo
Added Company Logo to DocType
|
2018-02-14 17:04:47 +05:30 |
|
Achilles Rasquinha
|
4b847f7897
|
fixed iteritems
|
2018-02-14 16:44:58 +05:30 |
|
Achilles Rasquinha
|
c67b1258dd
|
python3-fixes
|
2018-02-14 16:14:52 +05:30 |
|
Achilles Rasquinha
|
b723033213
|
python3-fixes
|
2018-02-14 16:13:37 +05:30 |
|
Achilles Rasquinha
|
1c86d18837
|
Added Hub Company Logo
|
2018-02-14 16:05:32 +05:30 |
|
PrakashH
|
908af53fcd
|
Update stock-reconciliation-for-non-serialized-item.md (#12908)
|
2018-02-14 13:16:25 +05:30 |
|
PrakashH
|
0c4c2981c8
|
Update journal-entry.md (#12909)
|
2018-02-14 13:15:53 +05:30 |
|
Saurabh
|
2735701aab
|
resolved merge conflicts
|
2018-02-14 11:51:09 +05:30 |
|
Saurabh
|
0500ce445f
|
Merge branch 'hotfix'
|
2018-02-14 11:45:31 +05:30 |
|
Saurabh
|
351dc08576
|
bumped to version 10.0.22
|
2018-02-14 12:15:31 +06:00 |
|
Achilles Rasquinha
|
5cf536b39d
|
Fixed iteritems and exceptions
|
2018-02-13 19:05:54 +05:30 |
|
Manas Solanki
|
ab70b53948
|
Delete .swp (#12894)
* Delete .swp
* updated gitignore to exclude temp vim files
|
2018-02-13 18:27:02 +05:30 |
|
rohitwaghchaure
|
8e675ebbe2
|
[Fix] Price list exchange rate is not visible when base currency and price list currency is different (#12898)
|
2018-02-13 17:11:06 +05:30 |
|
Faris Ansari
|
d53b149828
|
[deadlock fix] Save if not set (#12896)
|
2018-02-13 16:31:00 +05:30 |
|
Faris Ansari
|
5a91989665
|
Remove total_projected_qty (#12889)
|
2018-02-13 16:00:52 +05:30 |
|
Nabin Hait
|
bb821ec2af
|
Fixed test dependencies
|
2018-02-13 14:49:09 +05:30 |
|
rohitwaghchaure
|
62d6593fe7
|
[Fix] Allow to make disbursement entry even if payment account in not set in the employee loan (#12882)
|
2018-02-13 14:43:37 +05:30 |
|
Achilles Rasquinha
|
56b2e12af8
|
Python 3 fixes [merge asap] (#12884)
* Python 3 fixes
* fixed compare
|
2018-02-13 14:42:40 +05:30 |
|
saurabh-bhosale
|
ed35a296ab
|
closes #12872 (#12888)
|
2018-02-13 14:40:59 +05:30 |
|
Prateeksha Singh
|
ecc6f86c7c
|
Merge pull request #12885 from netchampfaris/setup-progress-deadlock-fix
[deadlock fix] Save if not set
|
2018-02-13 13:16:37 +05:30 |
|
Faris Ansari
|
f0056f7338
|
[deadlock fix] Save if not set
|
2018-02-13 12:18:24 +05:30 |
|
saurabh-bhosale
|
99eb30242d
|
[Fix] Bug fix in customer_primary_address frappe call (#12880)
|
2018-02-13 07:58:47 +05:30 |
|
pawan
|
471a018e67
|
remove old stock entry method/rewrite test case
|
2018-02-12 21:15:46 +05:30 |
|
Nabin Hait
|
b005950ba7
|
Merge branch 'mntechnique-show_address_in_online_pos' into develop
|
2018-02-12 19:25:27 +05:30 |
|