Commit Graph

20414 Commits

Author SHA1 Message Date
Faris Ansari
638e3f9fa6 Merge pull request #11154 from netchampfaris/hub-item-image
[hub] fix company page routing
2017-10-27 17:07:10 +05:30
Saurabh
1bc8e32f94 Merge pull request #11360 from manassolanki/fix-fee-patch
fix the fee patch
2017-10-27 17:00:11 +05:30
Faris Ansari
8c1099d236 Add POS Profile User DocType 2017-10-27 16:48:07 +05:30
Manas Solanki
8637e52d4c fix the fee patch 2017-10-27 11:55:15 +05:30
tunde
bbce7b7e5d get attribute with get method 2017-10-26 14:31:13 +01:00
Faris Ansari
c83413134d Merge pull request #11294 from revant/map_field_docs
[Docs] added field for storing map
2017-10-26 17:19:46 +05:30
Nabin Hait
c799a22d55 Merge branch 'master' into staging 2017-10-26 14:35:34 +05:30
Nabin Hait
edef9811f9 Merge branch 'master' into develop 2017-10-26 14:35:34 +05:30
Nabin Hait
92e09c0b7b Merge branch 'hotfix' 2017-10-26 14:35:33 +05:30
Nabin Hait
819c50c042 bumped to version 9.2.2 2017-10-26 15:05:33 +06:00
Faris Ansari
6887cedaea [fix] item qty trigger (#11349) 2017-10-26 14:34:15 +05:30
Nabin Hait
aa7896f1e1 [test] Fixed physician test cases (#11347) 2017-10-26 14:33:28 +05:30
Nabin Hait
52909b73bb [test] Fixed advance jv cancellation (#11333) 2017-10-26 11:06:07 +05:30
Saurabh
b445633e56 Merge branch 'master' into staging 2017-10-26 09:59:22 +05:30
Saurabh
0d597cef8d Merge branch 'master' into develop 2017-10-26 09:59:22 +05:30
Saurabh
5235aa833c Merge branch 'hotfix' 2017-10-26 09:59:22 +05:30
Saurabh
d0131762cc bumped to version 9.2.1 2017-10-26 10:29:22 +06:00
Saurabh
97b98b6c01 Merge pull request #11345 from saurabh6790/setup_wiz_fixes
[HOTFIX] translate domain
2017-10-26 09:52:45 +05:30
Saurabh
92a6155bb0 [fix] translate domain 2017-10-26 09:44:51 +05:30
Faris Ansari
33d74ce6e5 Merge branch 'develop' into hub-item-image 2017-10-25 18:06:42 +05:30
Saurabh
d6e67ce123 [fix] check for null date fields (#11334) 2017-10-25 17:44:22 +05:30
Nabin Hait
6a4e230cde [fix] Status of Item (#11326) 2017-10-25 17:06:30 +05:30
rohitwaghchaure
c65f1d7745 Search item using name instead of item code (#11327) 2017-10-25 17:04:56 +05:30
rohitwaghchaure
e02ee898e9 [Fix] Production order not displaying in the calendar view, if po has no operations (#11328) 2017-10-25 17:04:31 +05:30
rohitwaghchaure
2e6f6d6749 [minor] cleanup code (#11331) 2017-10-25 17:03:49 +05:30
Nabin Hait
014b138074 Merge branch 'tundebabzy-issue-11080' into hotfix 2017-10-25 15:53:53 +05:30
Nabin Hait
fb734976eb Removed appintment field from Invoice, it should be a custom field and will be added from domain settings 2017-10-25 15:53:07 +05:30
Nabin Hait
6500af9aa2 Merge branch 'develop' into staging 2017-10-25 14:25:06 +05:30
Nabin Hait
8f2500083c Merge branch 'master' into develop 2017-10-25 14:10:39 +05:30
Nabin Hait
8e7ba95b78 Merge branch 'staging' 2017-10-25 14:10:38 +05:30
Nabin Hait
e146143bd1 bumped to version 9.2.0 2017-10-25 14:40:38 +06:00
Nabin Hait
4d22b6db30 Fixed Merge Conflict 2017-10-25 14:09:46 +05:30
Nabin Hait
cd3dbcb2ef Fixed Merge Conflict 2017-10-25 14:07:25 +05:30
Nabin Hait
bdfc074a7d Merge branch 'hotfix' 2017-10-25 14:02:33 +05:30
Nabin Hait
c7bd77111e bumped to version 9.1.8 2017-10-25 14:32:32 +06:00
rohitwaghchaure
4a60554b91 Green indicator in the cart for non stock item (#11325) 2017-10-25 13:59:29 +05:30
rohitwaghchaure
3dc21b099d [Fix] Translation issue (#11323) 2017-10-25 12:38:17 +05:30
tundebabzy
40a02769c5 Error in the Address fetched in Sales Order.(#11129) (#11145)
* add new function - `get_party_shipping_address`

* `swap `get_default_address` with `get_party_shipping_address`

* test cases

* properly sets order by direction

* move `get_party_shipping_address` to party.py

* fix test module import
2017-10-25 12:24:34 +05:30
tundebabzy
bafcd7418a Add Bundle Description Field To Product Bundle (#11122)
* add description field that shows in list view

* description field should be simply `description`
2017-10-25 12:22:08 +05:30
Makarand Bauskar
085b4842a1 [minor] minor fixes in get_company_details for Hub page (#11168) 2017-10-25 12:19:10 +05:30
Makarand Bauskar
e6712c129c [hotfix] fixed Permissions Error while fetching allow_stale field value from Accounts Settings (#11182)
* [hotfix] fixed Permissions Error while fetching allow_stale field value from Accounts Settings

* [minor] renamed the allow_stale_rate method to stale_rate_allowed
2017-10-25 12:17:40 +05:30
Doridel Cahanap
49a7bde6e2 [minor] Label for Training Event in Training Program Dashboard (#11280) 2017-10-25 12:15:17 +05:30
Manas Solanki
464289b726 copy the older total amount field and corrsp. changes in report (#11322) 2017-10-25 12:13:42 +05:30
Nabin Hait
1c1237537b Subscription fixes (#11292)
* Subscription fixes

* Removed recurring fields, cleanup code
2017-10-25 12:10:44 +05:30
Nabin Hait
b7483f6dfd Update item.json 2017-10-25 11:58:02 +05:30
tundebabzy
cba7a11d75 Make Variant does not copy UOM properties (#10887) (#11261)
* add `uoms` to Item Variant Settings if not already added

* add new patch to patch list

* change uoms field to no_copy:0
2017-10-25 11:57:10 +05:30
Pawan Mehta
07ab4622e8 [fix] #9824 - Calculate costing amount even if billable is unchecked (#11310)
* [fix] #9824

* fix code
2017-10-25 11:55:49 +05:30
Narciso E. Núñez Arias
47caf51efe [docs] Translate the Projects section of the Manual to Spanish (#11319)
* [docs] Translate projects module. Add index page

* [docs] Translate activity cost page from projects module.

* [docs] Translate activity type page from projects module.

* [docs] Translate the Project Costing article in project module

* [docs] Translate the Project page in projects module

* [docs] Translate the Task page in projects module

* [docs] Translate the Time Log Batch page in projects module
2017-10-25 11:53:10 +05:30
rohitwaghchaure
2672c331af Validation for duplicate offline pos (#11281) 2017-10-25 11:47:18 +05:30
Nabin Hait
f4283a3ebf Moved company field to the top in BOM (#11283) 2017-10-25 11:46:47 +05:30