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
.
* [Fix] Unable to save asset because of float error issue (#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
rohitwaghchaure
dcf10ee4f6
Fixed patch ( #9862 )
2017-07-14 13:02:38 +05:30
Saurabh
e74e4b18c7
[patch][fix] update gst_state only if company country is india
2017-07-13 14:38:43 +05:30
rohitwaghchaure
c3153655eb
Fixed patch create_warehouse_nestedset ( #9833 )
2017-07-13 12:17:12 +05:30
Nabin Hait
1a60931435
Added SAC codes and 2/4 digit HSN codes, regional setup can be called multiple times ( #9820 )
2017-07-13 12:16:04 +05:30
Nabin Hait
7312186c76
Set corrected states list in GST State field's options
2017-07-13 10:41:15 +05:30
Nabin Hait
3a200bbc44
Update create_address_doc_from_address_field_in_company.py
2017-07-11 11:34:27 +05:30
Manas Solanki
1a0536bff4
changes as per review
2017-07-11 11:16:16 +05:30
Manas Solanki
cdba021802
patch for removing the address field from company and creating address doc, fixes #9011
2017-07-11 11:16:16 +05:30
Nabin Hait
dd7a723214
minor fixes while upgrading an old instance
2017-07-10 16:41:59 +05:30
Nabin Hait
1b36336fc3
Added new option in invoice_copy, made state_number read_only ( #9695 )
...
* Added new option in invoice_copy, made state_number read_only
* removed the trailing whitespace
2017-07-07 14:05:33 +05:30
Nabin Hait
8b486b0f28
Fixed state code of WB and allowed invoice_copy to edit after submit
2017-07-07 13:14:25 +05:30
Makarand Bauskar
88a37c17a6
[hotfix] commit after every 200 production orders ( #9674 )
2017-07-06 19:13:09 +05:30
Rohit Waghchaure
6d03790b44
Revert sales invoice serial no issues
2017-07-06 15:58:50 +05:30
Nabin Hait
f3f0dfef2a
Invoice copy, state code in gst print format, hsn code in other sales/purchase docs ( #9658 )
...
* Invoice copy, state code in gst print format, hsn code in other sales/purchase docs
* Formatted Net Amount in item-tax-breakup
* GST print format fixes
* removed trailing whitespace
* removed trailing whitespace
2017-07-06 14:49:34 +05:30
rohitwaghchaure
5d5a81f375
Fixed patch create_warehouse_nestedset ( #9656 )
2017-07-06 13:03:11 +05:30
Nabin Hait
949a920022
Production Order Enhancements ( #9432 )
...
* Production Order Enhancements
- Show required items child table
- Source warehouse for each raw materials, in Pro Order Item and BOM Item table
- Group warehouse allowed for source and wip warehouse
- Patch to populate required items, to fix status and reserved qty for stopped pro order
- Cleaned up existing codes
- Test cases
* Set available qty in source and wip warehouse
* minor fix in bom query naming
* Minor Fixes
* Reload BOM doctypes in patch
2017-07-05 13:55:41 +05:30
Nabin Hait
852cb64e4f
GST tax invoice print format and more ( #9616 )
...
* GST Tax Invoice print format and more. Fixes #9545 #9566 #9608
* Reload gst print format only for Indian users
* Fixes as Codacy
2017-07-05 12:58:19 +05:30
rohitwaghchaure
10a4a13e5e
Remove gst reports for non indian accounts ( #9553 )
...
* remove gst reports for non indian accounts
* [Fix] GSN code auto name
2017-07-04 16:45:29 +05:30
Rohit Waghchaure
3856d14ae6
[Fix] Options must be a valid DocType for field Customs Tariff Number
2017-06-30 11:57:41 +05:30
mbauskar
0c2de6e07a
[minor] fixed the report value for deprecated report patch
2017-06-29 21:47:14 +05:30
Makarand Bauskar
5d95ebec4e
Merge pull request #9508 from rohitwaghchaure/contacts_module_error
...
[Fix] Module error during patch execution
2017-06-29 10:46:17 +05:30
mbauskar
d6e8bb5452
[fixes] delete auto email report of deprecated reports and other minor fixes
2017-06-29 08:39:01 +05:30
Rohit Waghchaure
2e4b4454b3
[Fix] Module error during patch execution
2017-06-28 17:31:59 +05:30
rohitwaghchaure
69279229cc
Merge pull request #8987 from bcornwellmott/bom_convert_uom
...
Added BOM UOM selection for items
2017-06-28 16:28:31 +05:30
Saurabh
be03de3ad6
Merge pull request #9502 from mbauskar/patch-fix
...
[fix] delete/update desktop icon for deprecated report
2017-06-28 13:28:33 +05:30
mbauskar
6daa6e422e
[fix] delete/update desktop icon for deprecated report
2017-06-28 13:26:50 +05:30
Saurabh
07913c3ff2
[fix] delete custom field tax_id if exists in trasaction Sales Order, Sales Invoice and Delivery Note
2017-06-28 13:16:50 +05:30
mbauskar
27692670b1
[fix] handle email exception if email account is not configured
2017-06-28 10:56:50 +05:30
Saurabh
3f2dd04b10
[fix] reload gst settings doctype in patch
2017-06-28 10:50:38 +05:30
Makarand Bauskar
eef3f62ff7
Merge pull request #9488 from rmehta/gst-reminder
...
[regional] ability to send gst reminders to all parties
2017-06-27 19:33:05 +05:30
Rushabh Mehta
01659271be
[minor] dont make fixtures again by patch
2017-06-27 18:05:54 +05:30
Rushabh Mehta
00ae424cac
[regional] ability to send gst reminders to all parties
2017-06-27 17:31:41 +05:30
Saurabh
c20abf6b2a
send email to system managers about gst setup
2017-06-27 13:21:57 +05:30
Makarand Bauskar
5d8803b23e
Merge pull request #9435 from rmehta/gst
...
GST (India) Setup and Invoices #8711
2017-06-27 11:44:33 +05:30
Saurabh
29fa0a9a17
[fix] patch fixes
2017-06-26 13:28:45 +05:30
Rushabh Mehta
d03203966a
[minor] fix old patch
2017-06-24 10:37:19 +05:30
Rushabh Mehta
25366a22ad
[minor] cleanup
2017-06-22 22:32:08 +05:30
Rushabh Mehta
919a74ad88
[gst] adde reports + docs
2017-06-22 22:32:08 +05:30
mbauskar
66e2a510b9
[minor] deleted deprecated reprots and changed the lead.json modified time
2017-06-22 16:57:46 +05:30
Makarand Bauskar
79d36c7c43
Merge pull request #9423 from mbauskar/patch-fix
...
[minor] save the system settings document
2017-06-22 12:49:35 +05:30
mbauskar
4b299ba009
[minor] save the system settings document
2017-06-22 12:46:31 +05:30
Makarand Bauskar
e995371b08
Merge pull request #9355 from rohitwaghchaure/company_wise_manufacturing_settings
...
[Enhance] Company wise perpetual inventory settings
2017-06-22 12:35:41 +05:30
Ben Cornwell-Mott
ac3ad0810a
Merge branch 'bom_convert_uom' of https://github.com/bcornwellmott/erpnext into bom_convert_uom
2017-06-21 10:17:39 -07:00
Ben Cornwell-Mott
1e96b7bbe5
Added conversion_factor update in patch
2017-06-21 10:16:50 -07:00
Makarand Bauskar
0ea5d941e6
Merge branch 'develop' into bom_convert_uom
2017-06-21 21:35:38 +05:30
mbauskar
196f3b1fb8
resolved merge conflicts
2017-06-21 14:38:06 +05:30
Rohit Waghchaure
e9ff1914fc
Added is_perpetual_inventory_enabled method
2017-06-20 11:26:37 +05:30
Rohit Waghchaure
a5f40941ae
[Enhance] Companywise perpetual inventory setting
2017-06-20 10:21:33 +05:30
bcornwellmott
6561b8ade9
Merge branch 'develop' into bom_convert_uom
2017-06-16 08:29:00 -07:00
mbauskar
3c1a53c325
[minor] use reload_doc instead of reload_doctype
2017-06-16 18:31:42 +05:30
mbauskar
2ea55c7143
[minor] reload Domain doctype before executing patch
2017-06-16 14:33:59 +05:30
Makarand Bauskar
3d6697949c
[minor] fixed the child table field name ( #9328 )
...
* [minor] exclude Other domain from Domains
* [minor] fixed the child table field name
2017-06-16 14:12:28 +05:30
Sagar Vora
b1c794a4f9
[hot] fix global name args is not defined ( #9326 )
2017-06-16 13:50:35 +05:30
rohitwaghchaure
fb45913b3b
[fix] Patch for move account head from account to warehouse ( #9325 )
2017-06-16 13:12:37 +05:30
Makarand Bauskar
dd986f659e
Merge branch 'pratu16x7-domainify' into domainify ( #9324 )
...
* bootstrap domains and set active_domain on setup
* [minor] Patch for domain docs
* [minor]
* Update create_domain_docs.py
2017-06-16 13:02:45 +05:30
Nabin Hait
84bc5601eb
Total sales cost in Project should be updated based on base_grand_total ( #9302 )
...
* Total sales cost in Project should be updated based on base_grand_total
* Patch to update sales cost in Project in base currency
2017-06-16 12:13:51 +05:30
Ben Cornwell-Mott
840c757b12
Merge branch 'bom_convert_uom' of https://github.com/bcornwellmott/erpnext into bom_convert_uom
2017-06-15 08:53:29 -07:00
Ben Cornwell-Mott
7055446508
Reload explosion and scrap items docs
2017-06-15 08:52:55 -07:00
Rushabh Mehta
e0434ad40e
Merge branch 'develop' into bom_convert_uom
2017-06-15 17:32:27 +05:30
mbauskar
5da3ac63bf
[minor] fixed merge conflicts
2017-06-15 16:09:42 +05:30
Makarand Bauskar
a4af7cb7d3
removed extra quote from query
2017-06-15 16:02:44 +05:30
Nabin Hait
5aee7d1b70
Change column length of in_words
2017-06-15 15:35:08 +05:30
Nabin Hait
6d7b0ce794
Warehouse Account Linking ( #9292 )
...
* [enhance] Added account in the warehouse
* documentation
* patch to move account head from account to warehouse
* fixed test cases
* Fixes in warehouse-account linking
* minor fix in test case
2017-06-15 11:09:27 +05:30
bcornwellmott
d53dd7f4c9
Merge branch 'develop' into bom_convert_uom
2017-06-13 08:40:24 -07:00
Saurabh
797f2030f8
Merge branch 'master' into develop
2017-06-13 15:20:13 +05:30
mbauskar
f819c93329
[minor] replaced db_save by db_update and added patch to remove the indexes on tabBin
2017-06-13 13:22:34 +05:30
bcornwellmott
5491275b66
Merge branch 'develop' into bom_convert_uom
2017-06-07 08:42:54 -07:00
Nabin Hait
a128b21baa
Fixed merge conflict
2017-06-07 12:17:17 +05:30
rohitwaghchaure
d2be55b2e0
[Fix] Orders not creating from the POS for new customer if customer name is based on naming series ( #8933 )
...
* [Fix] Orders not creating from the POS for new customer if customer name is based on naming series
* [fix] Disabled price field in POS, if Allow User to Edit Rate field is disabled in POS profile
* added customer name in the search bar of the customer
* search customer by phone number and email id in the POS
2017-06-07 12:04:01 +05:30
tundebabzy
99b734bfd7
Fix #4587 : Status does not display "Pending" in report filter ( #9104 )
...
* adds Material Request to `status_map`
* updates eval condition for Partially Ordered in Material Request map
* changes material_request doctype to include "pending", "ordered", "partially ordered", "issued", "transferred" as options
* adds more options to `validate_status`
* adds `set_status` just before saving
* adds `check_for_closed_status` in `before_cancel`
* adds patch to convert status to material request specific status
* adds stricter status update conditions
* changes `update_status` to me `set_status`
* adds checker such that draft status can only change to pending
* renames `check_draft_status` to `status_can_change`
* adds Cancelled to Material Request map
* makes `status_can_change` block any attempt to change a cancelled document
* adds more test cases
* updates what `set_status` checks for before adding comment
* adds patch to rename the present material request status
2017-06-07 12:02:07 +05:30
Ben Cornwell-Mott
a3aa6a4449
Changed Explosion Item as well
2017-06-02 16:54:03 -07:00
Nabin Hait
02d282f347
Merge branch 'master' into develop
2017-06-01 19:09:37 +05:30
Manas Solanki
f02c82aeca
Fixes in the patch ( #9027 )
...
* fix in the patch
* new patch for student groups
* changes in the merge student batch patch
2017-06-01 13:08:27 +05:30
bcornwellmott
8fa1e03367
Merge branch 'develop' into bom_convert_uom
2017-05-24 12:35:12 -07:00
Ben Cornwell-Mott
0f0b121669
Added BOM UOM selection for items
...
Added patch for BOM Item UOM
Fixed scrap qty issue
Added Scrap Qty update to patch
Reverted test record for production order
2017-05-24 11:12:51 -07:00
Nabin Hait
c795386230
Fixed merge conflict
2017-05-24 18:39:16 +05:30
mbauskar
ff70f38eac
[minor] patch to delete the schools deprecated doctypes
2017-05-24 17:13:16 +05:30
Nabin Hait
2f0c34385b
Check if doctype exists before renaming
2017-05-24 17:12:07 +05:30
Nabin Hait
258f7da778
Paid amount + Write Off Amount can not be greater than Grand Total in return POS
2017-05-24 17:12:07 +05:30
Makarand Bauskar
3b9c2a4438
Added a reference of Sales Invoice in Serial No ( #8855 )
...
* [enhance] added Sales Invoice reference in Serial Number
* [patch] added test cases for Sales Invoice and added patch to copy sales invoice
* [minor] minor fixes in validate_serial_against_delivery_note
* [minor] fixes in sales invoice serial number validation
2017-05-23 18:45:34 +05:30
Manas Solanki
552f7ab678
fix in the patch for merging the student batch and student group ( #8961 )
2017-05-23 11:38:57 +05:30
Nabin Hait
8a27cf3785
Fix status of invoices with negative outstanding, if no return entry ( #8829 )
...
* Move allowance field in Item to the first section to apply it for both stock and non-stock items
* Fix status of invoices with negative outstanding, if no return entry
* get_value included in safe_eval
2017-05-16 12:43:00 +05:30
rohitwaghchaure
73456ac81a
[fix] Payments on the invoice is showing even if IS POS option is disabled ( #8802 )
2017-05-16 11:29:57 +05:30
Nabin Hait
7bf810300e
Fixed #8822 , active students patch
2017-05-15 11:42:37 +05:30
Makarand Bauskar
d4e15ca359
[minor] create student batch if does not exists ( #8781 )
...
* [minor] create student batch if does not exists
* [fix] minor fixes in if condition
2017-05-12 11:23:58 +05:30
Nabin Hait
62d27ab7d3
Reload doctype bewfore renaming margin fields ( #8771 )
2017-05-11 13:26:55 +05:30
Makarand Bauskar
0e4c5c9efb
[minor] renamed a Total Margin field to Rate With Margin ( #8720 )
...
* [minor] renamed a Total Margin field to Rate With Margin
* [minor] minor fixes in field lable
2017-05-11 11:40:02 +05:30
Manas Solanki
426b8a14fd
Merge the student group and student batch ( #8663 )
...
* deleted student batch creation tool
* Patch for deleting the doctype and config
* Changes in the student attendance
* Patch for renaming the student batch as student group
* Changes in the student attendance
* Change in the student attendance reports
- Absent student report
- Student Batch-wise attendance
- Student monthly attendance sheet
* Changes in the patch
* Changes in the course schedule
* Changes in the course scheduling tool
* Change in the assessment plan
* Changes in the assessment result tool
* Cleanup
* Changes in the api.py
* create student group from student batch
* delete student batch
* add patch
* remove student batch from config/schools.py
* Delete the depricated doctype with patch
* Changes in patch
* Changes as per PR
2017-05-09 15:32:52 +05:30
Javier Wong
470535ae9b
Removed set_default_roles
...
set_default_roles was removed in 7fff0908a4
It is not required anymore. It currently breaks the patch.
2017-05-03 16:44:14 +05:30
mbauskar
e94c6e7b8e
[minor] disabled the instructor role if the company domain is not Education
2017-05-01 11:40:13 +05:30
Nabin Hait
c98f37f91c
Patch for reverting manufacturers table from item
2017-04-28 09:58:41 +05:30
Nabin Hait
85622f9ccb
Update update_status_as_paid_for_completed_expense_claim.py
2017-04-25 20:43:29 +05:30
mbauskar
9cf6d630e9
[minor] fixes for expense claim status
2017-04-25 13:15:50 +05:30
Nabin Hait
825e053e66
Fixed project_copied_from patch
2017-04-20 08:50:37 +05:30
Nabin Hait
e42fb32f6f
Fixed allow_zero_valuation_rate patch
2017-04-20 08:45:18 +05:30