Vishal
474d58cecf
[fix] minor changes
2017-12-05 17:19:02 +05:30
Vishal
debc93c58a
[new] Non Profit Domain patch added
2017-12-05 16:41:09 +05:30
Vishal
7e50bf3674
[fix] Minor changes in patch set member as party type
2017-12-05 16:41:09 +05:30
Vishal
3a75a5e9b5
New Party Type Member Added
2017-12-05 16:41:09 +05:30
Shreya
f8e7bc7c5b
removed process payroll doctype
2017-12-04 16:49:44 +05:30
pawan
990277a0de
patch
2017-12-01 16:45:47 +05:30
Saurabh
d505d83cb6
[fix] merge conflicts
2017-12-01 16:23:46 +05:30
Jamsheer
f4d9af1ab9
Fix Patch - remove company from patient ( #11819 )
2017-12-01 16:10:39 +05:30
Saurabh
34a0e90115
[fix] merge conflicts
2017-11-30 16:45:01 +05:30
Nabin Hait
c5e0d22464
Update set_delivery_date_in_so_item.py
2017-11-30 15:52:47 +05:30
Vishal Dhayagude
8677cd1565
[patch] Patch added to rename net_weight field ( #11798 )
2017-11-30 13:52:30 +05:30
Zarrar
95ee7654a1
Employee tree ( #11667 )
...
* nested set implemented
* treeview for employee
* patch added to assign lft rgt, update nsm_model on trash
* call on_trash method of super class
2017-11-29 18:44:02 +05:30
rohitwaghchaure
c037dc775e
Refactor multi pos profile selection in the pos invoice ( #11721 )
2017-11-28 16:11:15 +05:30
Shreya Shah
8d9edbf133
Letterhead in user progress ( #11679 )
...
* added letter-head to user progress slides
* added letterhead action to patch
* improvised
* added date in patches.txt
2017-11-28 16:09:58 +05:30
Saurabh
b750b304dd
fixed merge-conflicts
2017-11-28 11:02:28 +05:30
Jamsheer
b488475d92
Remove Company from Patient - Patches Added ( #11716 )
...
* Remove Company from Patient - Patches Added
* Update patient DOB field label to Date of birth
* Patient marital status default null
* Update patient.py
2017-11-28 10:47:06 +05:30
Shreya Shah
e3d6d21ec5
[Fix] Item name and description in production order ( #11723 )
...
* fetch item name and description from bom
* Update production_order.py
* patch added
* Update set_item_name_in_production_order.py
2017-11-27 12:02:13 +05:30
Nabin Hait
82ef26b327
Minor fix in patch
2017-11-23 17:57:33 +05:30
Manas Solanki
966f141f62
Rename schools to Education ( #11524 )
...
* renaming for the docs, demo data and patch
* changes in the doctypes and reports
* rename the config file
* Few name changes in messages and license
* rename the school settings to education settings
* changes in the documentation
* added the setup file for the fixtures
* corrected the ui tests file path
* fix the codacy
* add the patch for renaming few doctypes and fields
* changes in the patch
2017-11-23 15:22:10 +05:30
Nabin Hait
cda4d50063
Fixed reserved qty for production logic and patch for reposting ( #11691 )
2017-11-23 13:05:43 +05:30
Nabin Hait
036bf6de6e
Merge branch 'develop' of https://github.com/frappe/erpnext into develop
2017-11-21 20:19:13 +05:30
Nabin Hait
32a62a02df
Fixed merge conflict
2017-11-21 20:18:03 +05:30
Nabin Hait
0551f7bb00
Cleanup and fixes of payment terms feature
2017-11-21 19:58:16 +05:30
rohitwaghchaure
e8ccc0e942
[enhance] Added multi UOM feature in Material Request ( #11352 )
...
* [enhance] Added multi UOM in Material Request
* test cases
* patch to update multi uom fields in material request item
2017-11-21 16:17:22 +05:30
Saurabh
5add4897a5
Merge pull request #11506 from saurabh6790/test_patches
...
[travis] run patches by restoring v7 database
2017-11-21 15:56:54 +05:30
Rushabh Mehta
5171da81a1
[minor] fix-patch
2017-11-21 15:18:47 +05:30
Saurabh
00e82cdab3
[fix] patch fixes to setup patch tester on travis
2017-11-17 19:08:01 +05:30
Saurabh
a4f78211ab
Merge branch 'master' into develop
2017-11-17 14:55:24 +05:30
Saurabh
11ec2c50e0
[fix] set default language in local
2017-11-17 14:51:08 +05:30
Rushabh Mehta
30dc9a14c6
[feature] [refactor] Shipping Rule for Buying + Refactor ( #11628 )
...
* Shipping rule for Buying
* [refactor] shipping rule
2017-11-17 14:31:09 +05:30
Saurabh
66e65dc104
[fix] merge-conflicts
2017-11-17 14:03:13 +05:30
Nabin Hait
1c4653ed97
Merge branch 'develop' into payment-terms
2017-11-17 12:41:56 +05:30
Saurabh
3499ba08df
[fix] do not translate domains while creating db record ( #11616 )
2017-11-17 12:29:26 +05:30
Nabin Hait
1783549e75
Minor fixes in patch
2017-11-17 12:20:07 +05:30
Rushabh Mehta
58dccf38c5
[fix] for tests
2017-11-17 12:12:53 +05:30
Vishal Dhayagude
82b200e497
[fix] Patch fail ( #11623 )
2017-11-17 11:01:42 +05:30
Rushabh Mehta
a5ebebd09c
[enhance] Add Issue Type and Opportunity Type masters ( #11598 )
...
* [enhance] added & linked Issue Type & Opportunity Type with opportunity
* [patch] create issue and opportunity type from the custom field if available
* [minor] issue_type and opportunity type should be mandatory
* [patches] removed try catch from the patch
* [fix] patch
* [refactor] cleanup issue/opportunity type
2017-11-16 17:03:52 +05:30
Neil Trini Lasrado
0df93d61eb
Update update_sales_cost_in_project.py ( #11595 )
...
Will break if select sum(base_grand_total) from `tabSales Order` where project=p.name and docstatus=1 returns Null. Gives - "OperationalError: (1048, "Column 'total_sales_cost' cannot be null")" Error
2017-11-16 14:07:55 +05:30
Nabin Hait
6fd163bc55
Merge branch 'master' into develop
2017-11-15 14:08:17 +05:30
rohitwaghchaure
43edd5d03c
Employee loan fixes ( #11495 )
...
* Employee loan fixes
* Update update_employee_loan_details.py
2017-11-14 17:59:20 +05:30
Nabin Hait
50616da905
Merge branch 'master' into develop
2017-11-14 17:48:43 +05:30
Nabin Hait
42274a4591
Delete healthcare domain items ( #11567 )
2017-11-14 17:15:11 +05:30
tunde
ffa659fd2c
Merge branch 'develop' into payment-terms
2017-11-14 09:59:45 +01:00
Faris Ansari
4ec4e3fb29
[patch] Revert Manufacturing User role ( #11514 )
2017-11-10 19:15:17 +05:30
Saurabh
7b78a83592
Merge branch 'master' into develop
2017-11-10 13:15:04 +05:30
rohitwaghchaure
1ce48e7032
[fix] POS profile patch ( #11501 )
2017-11-10 10:53:12 +05:30
Saurabh
b97f08e0ac
[fixed] merge-conflicts
2017-11-08 15:08:38 +05:30
Saurabh
045b2877b7
[fix] remove warehouse from Stock Settings if warehouse wont exists ( #11487 )
2017-11-08 14:57:03 +05:30
Saurabh
d2cef208fe
[fix] catch link validation exception in POS profile and reload fees doctype
2017-11-08 14:44:43 +05:30
Nabin Hait
ff73646212
Made POS Profile mandatory and changed test order
2017-11-08 14:34:38 +05:30
Saurabh
f41b13b736
[fix] merge-conflicts
2017-11-08 12:18:41 +05:30
Achilles Rasquinha
7fd20f303f
moved from MySQLdb to pymysql ( #11462 )
2017-11-08 11:33:24 +05:30
Manas Solanki
40ef7e7039
patch for renaming the pos profile and setting the pos profile name
2017-11-06 13:53:52 +05:30
Faris Ansari
7095de03ef
Merge branch 'develop' into multiple-users-pos-profile
2017-10-30 15:00:55 +05:30
tunde
5ea10a77a3
Merge branch 'develop' into payment-terms
2017-10-27 17:37:15 +01:00
Saurabh
1bc8e32f94
Merge pull request #11360 from manassolanki/fix-fee-patch
...
fix the fee patch
2017-10-27 17:00:11 +05:30
Manas Solanki
8637e52d4c
fix the fee patch
2017-10-27 11:55:15 +05:30
tunde
14e97ce0c8
Merge branch 'develop' into payment-terms
2017-10-26 13:35:42 +01:00
Saurabh
d6e67ce123
[fix] check for null date fields ( #11334 )
2017-10-25 17:44:22 +05:30
Nabin Hait
4d22b6db30
Fixed Merge Conflict
2017-10-25 14:09:46 +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
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
tunde
c8d2361b81
Merge branch 'develop' into payment-terms
2017-10-24 12:25:29 +01:00
Nabin Hait
7533101d4b
Merge branch 'master' into develop
2017-10-21 11:29:40 +05:30
Nabin Hait
c44290955e
Minor fix in patches ( #11268 )
2017-10-21 11:20:18 +05:30
tunde
09ce68ec19
Merge branch 'develop' into payment-terms
2017-10-19 17:47:31 +01:00
Saurabh
5fa2adcca9
Merge branch 'master' into develop
2017-10-18 16:23:44 +05:30
Saurabh
3173be9b17
[minor-fix] patch fix
2017-10-18 16:14:20 +05:30
Saurabh
8227422124
[fix] remove explicit variant save
2017-10-18 16:03:40 +05:30
Saurabh
a7d5f94d4a
[fix] Do not append description to variant if description already exists ( #11204 )
2017-10-18 16:02:08 +05:30
Rushabh Mehta
bc4e2cd9c1
[added] hospitality domain ( #11020 )
...
* [added] hospitality domain
* [tests] wip
* [tests] for restaurant
* [fix] tests for new naming
* [docs] added restaurant docs
* [docs] added restaurant docs
2017-10-17 12:30:34 +05:30
tunde
37c2b6116c
Merge branch 'develop' into payment-terms
2017-10-09 15:42:47 +01:00
mbauskar
966b3c156a
[conflicts] resolved merge conflicts
2017-10-09 15:20:30 +05:30
tunde
e27f5dee1f
Merge branch 'develop' into payment-terms
2017-10-09 10:11:05 +01:00
rohitwaghchaure
e181dd4c24
[patch] To add healthcare domain ( #11105 )
2017-10-09 12:43:36 +05:30
Manas Solanki
f91ad75b5a
test, patch, docs for student admission ( #11075 )
2017-10-09 12:41:24 +05:30
tunde
d82677f1e6
Merge branch 'develop' into payment-terms
2017-10-06 02:23:45 +01:00
Nabin Hait
5a834209d0
Cleanup of PO schedule date pull requests
2017-10-05 19:51:10 +05:30
Nabin Hait
395cf4689b
Cleanup of schedule date functionality in Material Request
2017-10-05 18:27:37 +05:30
Saurabh
444bfff1ff
[fix] resolved merge conflicts
2017-10-03 18:03:18 +05:30
Rohit Waghchaure
445e8a2e57
[Fix] Subscription end date, cancel issue, added from and to date
2017-10-03 17:45:11 +05:30
Sunny
38647ed832
move Purchase Order patch to v9
2017-10-02 11:37:48 +08:00
Sunny
9626ed79fa
Add patch to update schedule date of submitted Purchase Orders
2017-10-02 11:35:32 +08:00
Faris Ansari
8ac56b26e0
[Enhancement] Allow Multiple users in POS Profile
2017-09-29 16:15:15 +05:30
tunde
3415ac6e9c
Merge branch 'develop' into payment-terms
2017-09-29 10:10:24 +01:00
Sunny
3ec6960478
move Material Request patch to v9
2017-09-28 15:26:20 +08:00
Sunny
bf68611567
clean code
2017-09-28 15:24:11 +08:00
Sunny
65cd9f2284
Add patch to update schedule date of submitted Purchase Orders
2017-09-28 15:23:09 +08:00
Sunny
23a4b09d43
Add Material Request schedule_date field, similar to delivery_date in Sales Order
2017-09-28 15:22:48 +08:00
Nabin Hait
c9f9e5235b
Fixed merge conflict
2017-09-28 12:31:33 +05:30
rohitwaghchaure
16645803f9
[fix] Added billing address gstin number in the sales invoice and delivery note as well in the sales gst reports ( #10872 )
2017-09-28 11:05:03 +05:30
Nabin Hait
fce14fdcf0
Fixed merge conflict
2017-09-27 17:21:21 +05:30
rohitwaghchaure
da8de2f0c7
Re-order patch sequence ( #10936 )
2017-09-27 17:11:40 +05:30
tunde
567119170e
Merge branch 'develop' into payment-terms
2017-09-26 17:28:07 +01:00
Nabin Hait
51a07d19c8
Merge branch 'master' into develop
2017-09-26 15:59:15 +05:30
Prateeksha Singh
ada8ba96b3
[setup] remove translations from action name ( #10911 )
2017-09-26 13:07:24 +05:30
Nabin Hait
360c1efd18
Merge branch 'master' into staging
2017-09-25 16:36:47 +05:30
Nabin Hait
0d0811ca14
reload print style
2017-09-25 16:33:45 +05:30
tunde
8a53b64ac4
Merge branch 'develop' into payment-terms
2017-09-25 10:31:42 +01:00
Nabin Hait
4ebac3380d
reload print style
2017-09-23 15:50:39 +05:30
tunde
82de375ba0
Merge branch 'develop' into payment-terms
2017-09-21 11:21:05 +01:00
Rohit Waghchaure
5b05335e89
added patch and set default fields after completion of setup wizard
2017-09-21 15:41:57 +05:30
tundebabzy
ab5b03011d
Enhance Currency Exchange Management ( #10482 )
...
* add new settings in Accouts Settings
* patch for new settings
* refactor `get_exchange_rate`
* adds validation
* tests validation
* disables conversion rate field if stale rates not allowed
* more test cases
more test case...
test `get_exchange_rate` behaviour with stale not allowed in sett..
fix currency exchange test case
do housekeeping after running accounts settings test
* clean up
* documentation
* make use of correct api url
* Fix tests failing due to wrong exchange rate from fixer.io
* remove mandatory constraint from `allow_stale`
* added info to documentation
2017-09-21 14:50:39 +05:30
tunde
3387d026b1
Merge branch 'develop' into payment-terms
2017-09-19 18:07:12 +01:00
Rohit Waghchaure
c15a3bd379
[fix] Subscription patch broken if reference document has been cancelled
2017-09-19 12:53:11 +05:30
Nabin Hait
bd4b80e3d8
Merge branch 'master' into develop
2017-09-19 12:05:41 +05:30
rohitwaghchaure
d02744b436
[fix] Subscription patch ( #10827 )
2017-09-18 17:23:00 +05:30
rohitwaghchaure
850eaa73b0
Move subscription module to accounts ( #10772 )
2017-09-18 17:23:00 +05:30
Utkarsh Goswami
bd0beb6c02
[fix] unknown column in production order ( #10828 )
2017-09-18 16:48:45 +05:30
Utkarsh Goswami
e78d5a240a
[fix] unknown column in production order ( #10828 )
2017-09-18 16:44:11 +05:30
tunde
9448f4b13c
codacy corrections
2017-09-18 12:08:34 +01:00
Saurabh
9c334c34a6
[fix]remove employee field from tab salary structure
2017-09-18 16:17:13 +05:30
Saurabh
2222f10720
[patch] remove employee name salary structure ( #10817 )
...
* [patch] remove employee name salary structure
* Update remove_employee_from_salary_structure_parent.py
2017-09-18 15:05:18 +05:30
Nabin Hait
bc9006ff30
Delete GST related doctypes and reports if account is from outside India ( #10808 )
2017-09-18 13:16:04 +05:30
mbauskar
ea832b8157
resolved merge conflicts
2017-09-14 15:32:10 +05:30
Nabin Hait
45dce89cae
Print Settings for printing taxes with zero amount ( #10782 )
...
* Print Settings for printing taxes with zero amount
* added __init__.py file to patch module v8_9
2017-09-14 15:17:38 +05:30
Rushabh Mehta
bf8e331135
[fix] unset default customer group ( #10689 )
...
* [fix] unset default customer group
* added __init__.py file for patch v8.9 directory
2017-09-14 15:03:45 +05:30
Prateeksha Singh
242218d2b7
Progress fixes ( #10710 )
...
* [progress] sales target slide
* [fix] rerun patch for sales target slide
2017-09-13 18:41:01 +05:30
tunde
1255aa0f11
Merge branch 'develop' into payment-terms
2017-09-12 11:54:52 +01:00
Nabin Hait
f8f29677fd
Merge branch 'master' into develop
2017-09-12 16:16:57 +05:30
Manas Solanki
580f39a12c
check the instructor table before querying ( #10754 )
2017-09-12 15:49:36 +05:30
rohitwaghchaure
38830e54d8
[fix] No module namd student_batch_name.student_batch_name error in the patch ( #10745 )
2017-09-12 11:25:02 +05:30
Rohit Waghchaure
4e006b0bc5
rename Is Online field to Use POS in Offline Mode in pos settings
2017-09-11 14:51:50 +05:30
tunde
199daf7ac5
Merge branch 'develop' into payment-terms
2017-09-08 09:59:13 +01:00
tunde
ad7d3a1733
Merge branch 'develop' into payment-terms
2017-09-07 13:13:59 +01:00
rohitwaghchaure
1b65575860
Merge branch 'develop' into pos-refactor
2017-09-07 17:15:58 +05:30
rohitwaghchaure
166b78f022
[Enhance] Subscription module ( #10089 )
...
* [Enhance] Subscription module
* Added view documents from the subscription form
* Test cases
* documentation
* UI Test cases, fixes
* Removed child table in the subscription
* Provision to make subscription from the document, added subscription in the dashboard for the sales and buying flow
* added patch to make subscription from the recurring data
* Rename field subscriptio to subscription_id, added new test cases, remove recurring_document from controller
* renamed subscription_id to subscription
2017-09-07 16:14:22 +05:30
tunde
353099d7ad
Merge branch 'develop' into payment-terms
2017-09-07 11:31:26 +01:00
Rushabh Mehta
6ef741554c
[fix] [patch] rename_company_sales_target_field.py
2017-09-06 10:53:26 +05:30
Faris Ansari
e4434d3200
Merge branch 'develop' into pos-refactor
2017-09-05 17:18:04 +05:30
tundebabzy
dc64f70f07
Merge branch 'develop' into payment-terms
2017-09-05 11:14:47 +01:00
tunde
7f9a462506
Merge branch 'develop' into payment-terms
2017-09-05 01:35:51 +01:00
tunde
b8ddae13ba
fix patches
2017-09-05 00:23:24 +01:00
tunde
60aecd87b1
fix bugs in patches
2017-09-04 19:40:31 +01:00
tunde
57171cdc48
patch for credit days in Supplier Type
2017-09-04 19:33:35 +01:00
tunde
95b3d7c619
patch for payment term field in Supplier Type
2017-09-04 19:32:14 +01:00
Nabin Hait
22cff25bf5
BOM rates as per selected currency and UOM
2017-09-04 18:31:45 +05:30
tunde
bc9b5d699e
fix patch
2017-09-04 13:40:54 +01:00
tunde
76bba08e45
patch to create and set default payment term in customer/supplier
2017-09-04 13:37:32 +01:00
tunde
feffca2b05
patch to add payment_terms_field
2017-09-04 13:34:31 +01:00
Prateeksha Singh
95d8fd38f5
User Progress ( #10336 )
...
* [user-progress] first cut
* [user-progress] Add users slide, remove taxes, make sample data
* wip tests
* [setup-wiz] UI test
* [user-progress] notif test, docs trim
* wip
* [user-progress] Setup Progress single to update action states, fixtures
* setup progress actions patch
* rename sales_target field patch
* [progress] wip reform slide data
* [progress] remove slide data
* [setup] add roles for GST doctypes, remove commit from fixtures
2017-09-04 11:14:04 +05:30
tunde
b3a6338c79
patch replace credit_days with payment terms schedule
2017-09-01 11:35:22 +01:00
tunde
f0e9dd2597
patch to add due_date to GL Entry table
2017-09-01 11:34:26 +01:00
tunde
1c2edaebc4
patch customer records
...
- creates payment term and payment term template based on credit_days setting
- sets payment term template for records that had credit_days
2017-08-31 22:52:06 +01:00
tunde
e5460ab1df
rename patch
2017-08-30 22:37:14 +01:00
tunde
6de18ce589
codacy fixes
2017-08-30 21:20:41 +01:00
Rohit Waghchaure
7e752c4ebf
Added patch, fixed codacy issue
2017-08-31 00:31:35 +05:30
tunde
a19ea6e2f3
Merge branch 'develop' of https://github.com/frappe/erpnext into payment-terms
2017-08-29 15:26:50 +01:00
tunde
7555a4a13e
fix patch and also patch payment entries
2017-08-29 13:40:16 +01:00
tunde
3b327ed55f
'modify patch to also adjust journal entries'
2017-08-29 10:23:19 +01:00
Aditya Hase
6ccb6562f1
Python 3 compatibility syntax error fixes ( #10519 )
...
* Use Python 3 style print function
* Use 'Exception as e' instead of 'Exception, e'
* Unpack tuple arguments explicitly in instead of relying on auto unpacking
* Use consistent indentation
* Use 0 if stock_frozen_upto_days is None
2017-08-28 18:17:36 +05:30
mbauskar
aaec42ebc2
resolved merged conflicts
2017-08-28 11:57:56 +05:30
tunde
6b2d9e4990
patch to add due date to GL Entries for Sales/Purchase invoice
2017-08-25 15:25:18 +01:00
Rushabh Mehta
6b651d734e
[fix] status in purchase_receipt.py ( #10534 )
2017-08-24 15:47:49 +05:30
Nabin Hait
adbf8adfb9
Update BOM cost in all BOMs based on latest rm rate
2017-08-22 10:49:57 +05:30
mbauskar
5088ad11ee
Merge branch 'master' into staging
2017-08-21 08:58:52 +05:30
mbauskar
62f0722325
resolved merge conflicts
2017-08-21 08:58:42 +05:30
Nabin Hait
879e162cce
Additional GST related fields in Invoice and Sales/Purchase Register reort ( #10405 )
2017-08-21 08:28:55 +05:30
Rohit Waghchaure
df83191ea0
Set write permission to sales manger for permlevel 1 in Quotation doctype
2017-08-17 11:27:30 +05:30
ckosiegbu
1ac6bcba23
Removal of SMS Settings and SMS Parameters from ERPNext ( #10033 )
...
* Removal of SMS Settings and SMS Parameter from ERPNext.
* [DOCS]Documentation for Two Factor Authentication
* [Patch]Point SMS module to frappe core
* Rearrange doc help index.txt to fit
* [DOCS]Update Documentation for Two Factor Authentication
2017-08-08 14:55:30 +05:30
mbauskar
4ef1e2046b
Merge branch 'master' into staging
2017-08-04 14:08:57 +05:30
mbauskar
e770824568
Merge branch 'master' into develop
2017-08-04 14:08:57 +05:30
Makarand Bauskar
b96e239cc0
[hotfix] ignore if project type is None ( #10284 )
2017-08-04 11:40:23 +05:30
mbauskar
cce79255fe
resolved merge conflicts
2017-08-04 11:07:49 +05:30
mbauskar
f3be738b68
resolved merge conflicts
2017-08-04 11:07:07 +05:30
Rushabh Mehta
1696294847
[fix] remove property setter for project type ( #10277 )
...
* [fix] remove property setter for project type
* [patch] project type
2017-08-04 10:50:56 +05:30
rohitwaghchaure
046e1a6e28
[Fix] Patch broken if serial no has single quote ( #10262 )
2017-08-03 17:38:03 +05:30
Nabin Hait
af01f5154b
Merge pull request #10251 from rohitwaghchaure/permlevel_1_write_permission
...
Set write permission to sales manger for permlevel 1 in Quotation doctype
2017-08-03 10:45:17 +05:30
Nabin Hait
b554f9077c
Update set_write_permission_for_quotation_for_sales_manager.py
2017-08-03 10:44:55 +05:30
mbauskar
73dc35ddbf
resolved merge conflicts
2017-08-02 18:24:03 +05:30
Rohit Waghchaure
250e964205
Set write permission to sales manger for permlevel 1 in Quotation doctype
2017-08-02 18:23:39 +05:30
mbauskar
ee090a9a3c
Merge branch 'master' into develop
2017-08-02 18:18:14 +05:30
Nabin Hait
9b2b42dfc1
Minor fix in bom_stock_qty patch
2017-08-01 11:10:29 +05:30
Makarand Bauskar
317888211a
merged hotfix branch into staging ( #10191 )
...
* [Fix] Error in sales invoice and POS if customer group not defined in the customer (#10148 )
* Revert "[Fix] Error in sales invoice and POS if customer group not defined in the customer (#10148 )" (#10159 )
This reverts commit 4d2e782e42#10157 )
* bumped to version 8.6.4
* [Fix] Error in sales invoice and POS if customer group not defined in the customer (#10160 )
* Set billing hours to 0 in timesheet #9535 (#10139 )
* `update_billing_hours` to use flt not cint
* if not billable, reset billable hours
* if not billable, reset time rates
* test
* [Fix] Timesheet Company Issue
* Added delivery date in SO parent form. Fixes #10104 (#10155 )
* Added delivery date in SO parent form. Fixes #10104
* UI tests for sales order delivery date
* bumped to version 8.6.5
2017-08-01 11:06:41 +05:30
mbauskar
8b6f7914b0
resolved merge conflicts
2017-07-31 12:30:53 +05:30
Nabin Hait
495ef67caa
Added delivery date in SO parent form. Fixes #10104 ( #10155 )
...
* Added delivery date in SO parent form. Fixes #10104
* UI tests for sales order delivery date
2017-07-31 11:25:51 +05:30
Rohit Waghchaure
33977827c4
[Fix] Timesheet Company Issue
2017-07-29 14:15:50 +05:30
rohitwaghchaure
e2176b852e
[Fix] Error in sales invoice and POS if customer group not defined in the customer ( #10160 )
2017-07-28 20:52:02 +05:30
Makarand Bauskar
20f4d7f559
Merge branch 'develop' into set_defualt_mode_payment
2017-07-28 14:41:48 +05:30
Rushabh Mehta
0fcf44e1a2
User Permissions Redesign ( #10006 )
...
* [fixes] for user permission
* [docs] updated docs for user permissions
* [docs] updated docs for user permissions
* [docs] updated docs for user permissions
2017-07-28 14:33:15 +05:30
Rushabh Mehta
d50da78f28
[fixes] errors caught on flake8 ( #10126 )
2017-07-28 11:39:01 +05:30
Rohit Waghchaure
5296e3c321
[enhance] Provision to set default mode of payment for the POS in POS profile
2017-07-27 19:17:05 +05:30
cclauss
6848708377
old style exception, raise --> new style for Python 3 ( #10082 )
...
* old style raise --> raise() for Python 3
* old style exception --> new style for Python 3
* old style exception --> new style for Python 3
* old style exception --> new style for Python 3
* old style exception --> new style for Python 3
* old style exception --> new style for Python 3
* old style exception --> new style for Python 3
* old style exception --> new style for Python 3
* old style exception --> new style for Python 3
* old style exception --> new style for Python 3
* old style raise --> raise() for Python 3
* old style raise --> raise() for Python 3
* old style exception, raise --> new style for Python 3
2017-07-27 10:38:35 +05:30
KanchanChauhan
7800bd89dc
Added Project Type new doctype to be added as link field for Project Type field in project instead of select field ( #9929 )
2017-07-26 17:55:25 +05:30
KanchanChauhan
d65b4b4238
Patch was faling, reload doc was missing ( #10072 )
2017-07-25 11:39:46 +05:30
bcornwellmott
96381da547
Supplier Scorecard ( #9294 )
...
* Initial start of scorecard docs
* Got basic functionality working
* Fixed doc names and added key functions
* Basic functional version minus Actions
* Hide scorecard docs until functional
* Created supplier scorecard documentation
* Added default variables and standings. Added restrictions for PO + RFQ
* Automatic daily scorecard creation + on save
* Added warning for PO nd RFQs
* Minor fixes for codepy, automatically add variables for criteria, fix hooks.py typo
* Added tests, fixed codacy formatting, small improvements
* Fixed test bug w/ criteria. Codacy cleanup
* Fixed codacy issues. Fixed sticky criteria
* Fixed bug with period search. Remove blank variable child.
* Updated docs, automatically add criteria and standings, clean up period create message
* Uncommented test, set docs to beta
* Fix for nabinhait review
* Fix codacy issue. Fix dict assignment for records
2017-07-24 22:42:30 +05:30
Makarand Bauskar
9306aff1bb
[minor] moved the patch to v8_5 and other minor fixes ( #10012 )
...
* Quotation and Supplier Quotation Route and Permission Edits
* [minor] moved the patch to v8_5 and other minor fixes
2017-07-21 15:19:47 +05:30
mbauskar
0e6933a1e8
resolved merge conflicts
2017-07-20 14:19:47 +05:30
Nabin Hait
9c42161061
Itemised tax breakup fix in docs other than invoice ( #9961 )
...
* Itemised tax breakup fix in docs other than invoice
* Set itemised tax breakup and hsn code in existing docs
2017-07-20 13:32:01 +05:30
Nabin Hait
8e0f23efc7
Multiple delivery dates in Sales Order and make DN based on selected delivery dates ( #9933 )
...
* Multiple delivery dates in Sales Order and make DN based on selected delivery dates
* Test case and some other minor fixes
* Updated docs for multi delivery date
* removed the trailing whitespace
* removed the trailing whitespace
* removed trailing whitespace
2017-07-20 10:30:59 +05:30
Makarand Bauskar
5e75e3ba03
[hotfix] set_restrict_to_domain_for_module_def patch fixes ( #9921 )
2017-07-18 15:09:30 +05:30
Makarand Bauskar
6e30f04181
[domainify] patch to set the restrict to domain for module_def ( #9912 )
2017-07-18 12:30:57 +05:30
Makarand Bauskar
c446bf6117
Merge branch 'develop' into rejected_expense_claim_issue
2017-07-18 10:54:13 +05:30
Prateeksha Singh
e012e24423
Sales Goal by Company ( #9723 )
...
* [sales goal] in company; dashboard, graph, notifs, wiz
* [test] target notifications
* cache past year monthly sales of every company daily, patch
* [minor] query fixes
* update sales goal docs
2017-07-18 10:35:12 +05:30
Rohit Waghchaure
8333b5754b
[Fix] Expense claim status issue
2017-07-17 16:38:20 +05:30
rohitwaghchaure
ea4497c8d2
Renamed the report Support Hours to Support Hours Distribution ( #9874 )
2017-07-17 14:55:42 +05:30
Makarand Bauskar
805a41d06c
[minor] fixed the set_portal_settings patch ( #9890 )
2017-07-17 13:44:56 +05:30
Nabin Hait
e06526ffff
Add indexes in some transaction doctypes ( #9889 )
2017-07-17 13:28:27 +05:30
mbauskar
71b5250cbd
[hotfix] fixed the state code for Uttarakhand
2017-07-16 21:28:39 +05:30
