Vishal Dhayagude
1e0ae07bff
[fix] Validate Party in not present in Party Type ( #12910 )
...
* [fix] Validate Party in not present in Party Type
* [fix] Minor Changes
* [fix] Valid Customer and Supplier fetch
* [WIP] Allow and prevent for creating party
* [fix] minor changes
* [fix] Requested Changes
* [fix] Codacy issue
* Update opening_invoice_creation_tool.py
2018-02-16 13:13:37 +05:30
Shreya Shah
3a9eec2e92
Calculate due date in Purchase Invoice on the basis of Supplier invoice date ( #12913 )
...
* pass bill_date as parameter and calculate due_date on that basis
* calculate payment_schedule on the basis of bill_date if present else posting_date
* add bill_date as an argument to get_party_details
* pass bill_date on supplier trigger in purchase invoice
2018-02-16 13:05:21 +05:30
Shreya Shah
278af1befb
remove deprecated processing payroll video links ( #12947 )
2018-02-16 12:58:04 +05:30
rohitwaghchaure
103c4e9b92
[Fix] Incorrect rate in item-wise sales register ( #12943 )
2018-02-16 12:57:35 +05:30
Shreya Shah
f4b271a02e
Customer and Supplier link fields in Member DocType ( #12942 )
...
* added link fields customer and supplier
* fixed a typo
2018-02-16 12:56:01 +05:30
Zarrar
5a947f38ab
avoid overlap with dropdown ( #12941 )
2018-02-16 12:49:30 +05:30
Prateeksha Singh
0acb63a938
Update hub domain 💥
2018-02-16 11:07:12 +05:30
Shreya Shah
394b7a2fa3
Rename Offer Letter to Job Offer ( #12934 )
2018-02-16 10:49:34 +05:30
rohitwaghchaure
5a5f73e46a
Merge pull request #12602 from PawanMeh/fixes_8540
...
Select multiple raw material items for Sub Contract Stock Entries
2018-02-15 18:54:29 +05:30
Nabin Hait
8a562266ad
Update set_b2c_limit.py
2018-02-15 18:40:18 +05:30
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
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
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
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
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
351dc08576
bumped to version 10.0.22
2018-02-14 12:15:31 +06:00
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
662b23ce57
get address display in customer
2018-02-12 19:25:00 +05:30
Nabin Hait
4adcced9ae
Merge branch 'show_address_in_online_pos' of https://github.com/mntechnique/erpnext into mntechnique-show_address_in_online_pos
2018-02-12 19:14:38 +05:30
rohitwaghchaure
6a7495dbc8
Removed set only once for maintain stock field in item master ( #12878 )
2018-02-12 17:25:24 +05:30
sivankar
a4ff220769
removed duplicate function and other CLI fixes ( #12876 )
...
* merge shelf like and manufacturing date
* setting default manufacturing date as todays date
* setting default manufacturing date as todays date
* fix
* Improvements to batch auto naming (#12496 )
* refactor:
add new function - batch_uses_naming_series
use batch_uses_naming_series in autoname method
* properly update naming series on delete:
- add new functions - get_batch_prefix, get_batch_naming_series_key, get_batch_naming_series
- refactor get_name_from_naming_series
- add after_delete method
* add documentation and rename some functions
* PEP 8 compliance
* test
* added support for jinja template and added validation if expiry date is set or not if item has_expiry_date is set
* bug fix, renamed item_code to item as in batch doctype we refer 'item code' by 'item'
* added manufacturing date wise sort
* added prefix to expiry date and manufacturing date
* Quality Review fixes
2018-02-12 17:24:26 +05:30
pawan
1b8c13b175
call make_rm_stock_entry
2018-02-12 16:59:59 +05:30
Nabin Hait
a8d10b7332
Update setup.py
2018-02-12 16:54:13 +05:30
Shreya Shah
d9a585bdad
Leave workflow patch fixes ( #12823 )
...
* modified patch for leave application workflow
* removed leave approval field from leave application doctype
* fetch lwp and attendance only if workflow field exists
* modified test cases
* modified files with leave application
* docstatus draft for rejected applications
* modified leave application calendar
* test fixed
* run patch only if any record exists
2018-02-12 16:02:57 +05:30
Nabin Hait
e21e59614f
Fixed merge conflict
2018-02-12 15:59:55 +05:30
tundebabzy
6e90f49a35
Wrong Exchange Rate Is Fetched When Exchange Rate Is Different From Company Currency For Price Lists #12712 ( #12714 )
...
* unconditionally fetch exchange rate
* Revert "unconditionally fetch exchange rate"
This reverts commit d0d404d342092b5ba4398ed3bd8d8ff8f60b5f8a.
* allow for `plc_conversion_rate` field to be reset
* fetch exchange rate using price list currency and company currency not form currency
* clean up
2018-02-12 15:18:57 +05:30
tundebabzy
c89782502c
Report presentation currency ( #12670 )
...
* Add new Select to filters
* get the currencies from database rather than hardcoded
* label report columns:
- If presentation currency is available in filters, use it or
- If company is available in filters, use it or
- use default company currency
* add new function - get_currency
* tweak new function `get_currency`
* add new function `convert` to convert a value to another currency
* add new function `convert_to_presentation_currency`
* clean up `get_currency` first pass
* memoise the exchange rates
* limit fetched GL entries to to_date
* check if account type is p&l or not and use appropriate exchange rate based on that
* change EXCHANGE RATE to a dict, use for memoisation
* rename EXCHANGE_RATE
* cache exchange rates and use them as needed
* add docstrings
* add presentation currency logic to financial statement reports
* move new functions from `general_ledger.py` to new module
* clean up
* PEP 8 clean up
* move function to util.py
* PEP 8 clean up
* remove presentation currency option from cashflow
* adjust currency as needed
* allow users to save presentation currency in Accounts Settings
* add new function `get_presentation_currency_list`
* refactor query_report modules with no promises
* Revert "allow users to save presentation currency in Accounts Settings"
This reverts commit 3b58a6296cf3f7b4d80ac55b03f9d5d4887b796b.
* show print page in correct currency
* Update utils.py
2018-02-12 15:04:50 +05:30
joezsweet
04338cfb4b
removed extra spaces
2018-02-12 10:12:27 +01:00
joezsweet
f9cb7ea611
removed extra spaces
2018-02-12 10:05:59 +01:00
sivankar
621740efd9
Enhancement and bug fix in batch ( #12753 )
...
* merge shelf like and manufacturing date
* setting default manufacturing date as todays date
* setting default manufacturing date as todays date
* fix
* Improvements to batch auto naming (#12496 )
* refactor:
add new function - batch_uses_naming_series
use batch_uses_naming_series in autoname method
* properly update naming series on delete:
- add new functions - get_batch_prefix, get_batch_naming_series_key, get_batch_naming_series
- refactor get_name_from_naming_series
- add after_delete method
* add documentation and rename some functions
* PEP 8 compliance
* test
* added support for jinja template and added validation if expiry date is set or not if item has_expiry_date is set
* bug fix, renamed item_code to item as in batch doctype we refer 'item code' by 'item'
* added manufacturing date wise sort
* added prefix to expiry date and manufacturing date
2018-02-12 14:33:40 +05:30
Fahim Ali Zain TP
277935be79
Deduct Rejected Item's Raw materials in SubContracting ( #12837 )
...
* Deduct Rejected Item's Raw materials in SubContracting frappe/erpnext#12752
* Travis Build Fix
2018-02-12 11:59:07 +05:30
Revant Nandgaonkar
2dee8fc255
Hotels ( #11907 )
...
* [new-module] hotels, start
* Multiple Changes
Hotel Settings Added
Make invoice on Hotel Reservation
* Hotel Room validation for overbooking
* Added test fixtures and test for Hotels
* Added Tests for Hotels
Overbooking
Pricing not set
* [WIP] Documentation
Hotel Room and Screenshot
* Added Calendar view for Hotel Room Reservation
* Added Report - Hotel Room Occupancy
* Added Hotel Reservation User in Hospitality domain
2018-02-12 11:57:12 +05:30
rohitwaghchaure
6e7e70c977
Added PDC from journal entry in AR report ( #12844 )
2018-02-12 11:55:07 +05:30
rohitwaghchaure
0aeeb7e02c
[Fix] Item variant details report ( #12869 )
2018-02-12 11:44:39 +05:30
Shreya Shah
caccd2289d
posting-date-fix ( #12849 )
2018-02-12 11:34:46 +05:30
Jamsheer
be9eae06ec
Physician - Set Details by User or Employee ( #12558 )
2018-02-12 11:33:44 +05:30
Ameya Shenoy
5c33a04043
Shareholder and related doctypes ( #12215 )
...
* Added doctypes related to shares
- Shareholder doctype, the entity who does the transaction
- Share doctype, a child table to kepp list of all shares
- Share Transfer doctype, Logs of all made transactions
* Added logic for share transfer
- update shareholder automatically on share transfer/issue/purchase
- purchase and transfer have method remove_share which doesn't get executed because of some bug
* Added report view for share ledger
* Removed share number tracking
- removed share number tracking from Share Ledger child table for Shareholder doctype
- new doctype Share Type created
* Share Balance report added
- math behind Share Balance report needs fixing
* Changes in shareholder
- Share numbers are not tracked in Shareholder
- Share Ledger doctype deleted
- Share Balance Report bug fixed
* Shareholder
- fixed report for share balance
- remove bug from share transfer by making share type mandatory
- added buttons to shareholder for direct link to report
* Added tests for Share Transfer
* minor codacy fixes
* Added Shareholder to Party Type
* rate in share ledger & balance report is currency
* First attempt at modelling shares after Item
* Share Manager changes
- on creation of shareholder party it should check if the same combo exists
- in shareholder party make report button visible iff folio no exists
- create folio no on creation of share transfer iff it doesnt already exist
- move reports from shareholder to shareholder party
* Shareholder chages
- delete share child table doctype
- autoname added to folio no
- modify tests for share transfer
* minor changes
* removed share_no child doctype
* Restructured Share Transfer Logic (not tested)
- Everything revolves around Share Balance child table in Shareholder Party
- is_company flag still to be utilized
* Tested Share Tranfer
* minor fixes
* started new shareholder structure
* modified shareholder
* renamed Shareholder Party to Shareholder
* Shareholder rewrite complete
* new tests for shareholder written
* codacy fixes
* Added documentation
2018-02-12 11:32:47 +05:30
Britlog
be9a7231d4
Fix bootstrap layout and move checkout button upper ( #12063 )
2018-02-12 11:28:57 +05:30
rohitwaghchaure
45ac31ab93
[Fix] Not able to save sales order ( #12851 )
2018-02-12 11:27:37 +05:30
rohitwaghchaure
7477899d2e
Formatter, code cleanup ( #12852 )
2018-02-12 11:25:58 +05:30
Jamsheer
00c1cf0a5a
Healthcare Menu Fixes ( #12830 )
2018-02-12 11:24:12 +05:30
Saurabh
cab73b8a02
[fix] execute update_time_and_costing and update_project only for distinct task and projects
2018-02-09 17:04:12 +05:30
Nabin Hait
b0819b528f
Minor fixes in gstr reports ( #12848 )
2018-02-09 15:30:55 +05:30
Manas Solanki
c7a9e3424b
Merge pull request #12845 from manassolanki/fix-so-update
...
don't set the ordered_qty in SO on load from BIN
2018-02-09 13:16:14 +05:30
Manas Solanki
a884bd9c6a
don't set the ordered_qty in SO on load from BIN
2018-02-09 13:12:07 +05:30
rohitwaghchaure
7e75165826
Merge branch 'develop' into fixes_12829
2018-02-09 12:01:41 +05:30
pawan
081f40c1bf
readded pos.css
2018-02-09 11:56:32 +05:30
Saurabh
0f3c4fa7a7
Codacy fix - used classmethod decorator
2018-02-09 11:30:11 +05:30
Saurabh
c29f3c70dc
Merge branch 'develop' of https://github.com/frappe/erpnext into show_address_in_online_pos
2018-02-09 10:51:49 +05:30
Saurabh
b4ab89e1da
[Mod] Code refactored to remove dependency on 'complete_address' field
2018-02-09 10:49:30 +05:30
Manas Solanki
458a4e13bd
updated the docs for education
2018-02-08 20:12:41 +05:30
pawan
1583120a54
remove pos.css
2018-02-08 20:00:12 +05:30
pawan
83b1b802d1
print hide and pos.less changes
2018-02-08 19:56:12 +05:30
pawan
33571dc567
print hide changes
2018-02-08 19:35:48 +05:30
pawan
31d37f110a
print hide changes
2018-02-08 19:25:30 +05:30
Manas Solanki
37b2aa2b11
changes in the education module ( #12827 )
...
update the module page
remove fee from beta
2018-02-08 19:00:51 +05:30
Pawan Mehta
e2bc8bb644
Update sales_invoice.json
2018-02-08 16:35:03 +05:30
pawan
735b8c6094
[fix] #12829
2018-02-08 16:20:46 +05:30
Saurabh
ab8c7e616e
resolved merge conflicts
2018-02-08 15:17:15 +05:30
Saurabh
c1f982a9bb
bumped to version 10.0.21
2018-02-08 15:34:25 +06:00
Faris Ansari
6041f5cb8c
[hotfix] Advance Total validation
2018-02-08 13:33:52 +05:30
rohitwaghchaure
144c9977a2
Merge pull request #12819 from netchampfaris/hotfix-get_party_account
...
get_party_account only if company is set
2018-02-08 11:42:41 +05:30
Faris Ansari
f7717b9ec2
get_party_account only if company is set
2018-02-08 11:11:21 +05:30
Prateeksha Singh
152bf37e7f
Merge pull request #12813 from pratu16x7/hub-fixes
...
Hub listing and entity page
2018-02-08 10:47:16 +05:30
pawan
5f779eb805
validation fix
2018-02-08 09:07:58 +05:30
Saurabh
1a4d77a962
Fixes #12810 for Offline POS
2018-02-08 01:32:48 +05:30
Saurabh
056c1709c6
Fixes #12810
2018-02-08 00:22:53 +05:30
Saurabh
0de0861bb4
Merge branch 'develop' of https://github.com/frappe/erpnext into show_address_in_online_pos
2018-02-08 00:10:49 +05:30
Prateeksha Singh
4413ce1be1
company page, deprecate custom page
2018-02-07 23:50:01 +05:30
pawan
2b885beaee
code changes for single stock entry
2018-02-07 19:06:18 +05:30
Bassam Ramadan
fd044a0d5e
docs-fixes ( #12805 )
2018-02-07 18:59:06 +05:30
rohitwaghchaure
b553b7a69d
PDC Enhancements ( #12462 )
2018-02-07 18:32:51 +05:30
Nabin Hait
ed26028a93
Minor fixes for depr based on FY
2018-02-07 18:25:45 +05:30
Nabin Hait
82a61c3bd9
Deleted restaurant order entry test cases
2018-02-07 16:56:07 +05:30
Nabin Hait
c224d34a2c
Merge branch 'master' into develop
2018-02-07 16:07:20 +05:30
Nabin Hait
67d6dc1ac6
bumped to version 10.0.20
2018-02-07 16:37:19 +06:00
Nabin Hait
33f967d97c
Account name length fixed in HUngary and Germen COA
2018-02-07 16:00:42 +05:30
Nabin Hait
4b1bd15f7e
Draft status in pos print format
2018-02-07 12:40:45 +05:30
rohitwaghchaure
9a5037193f
Removed DR/CR from balance column ( #12791 )
...
* Removed DR/CR from balance column
* Update general_ledger.html
* Update general_ledger.py
2018-02-07 12:10:14 +05:30
Shreya Shah
80423de611
posting date in journal entry should not be nowdate ( #12801 )
2018-02-07 12:08:08 +05:30
Manas Solanki
b4693c6957
fix for making the invoice from the timesheet ( #12803 )
2018-02-07 12:07:27 +05:30
Saurabh
50f7e29814
[New] Added Draft status in POS Invoice print formats if a Draft POS Invoice is printed
2018-02-06 00:23:21 +05:30
Rohit Waghchaure
e8d22bb999
[Fix] Incorrect change amount if enabled rounded total
2018-02-05 18:13:29 +05:30
joezsweet
097a98cc10
fixed spaces to tabs
2018-02-05 13:16:00 +01:00
joezsweet
a8d5ef4891
space to tabs
2018-02-05 13:06:30 +01:00
Saurabh
e26773d91e
Merge branch 'develop' of https://github.com/frappe/erpnext into show_address_in_online_pos
2018-02-05 17:05:29 +05:30
joezsweet
5f473611bd
space to tab
2018-02-05 12:05:11 +01:00
joezsweet
2f7ab065fb
- removed barcodes from force_item_fields
2018-02-05 11:54:32 +01:00
Nabin Hait
b02c109e1d
Cleanup and fixes on GSTR-2
2018-02-05 16:09:51 +05:30
Prateeksha Singh
3eaccffbd9
[hub] items searchable via core filters
2018-02-05 12:58:30 +05:30
Prateeksha Singh
b8e9c9be08
[hub] form (info) view for items
2018-02-05 12:58:30 +05:30
Faris Ansari
9b64620bc0
[hub] hub page using BaseList
2018-02-05 12:57:49 +05:30
Vishal Dhayagude
cce29fabf4
[fix] validation between Selling Price and Valuation Rate should not be validated in the Sales Return entry ( #12767 )
2018-02-05 12:25:51 +05:30
rohitwaghchaure
0f5c18ca81
[Fix] For non stock item, not able to place an order from shopping cart ( #12758 )
2018-02-05 12:25:02 +05:30
rohitwaghchaure
a4c40e0fd6
[Fix] After accesing POS page, it does not work when going back from another page ( #12763 )
2018-02-05 12:24:06 +05:30
Nabin Hait
2ef1f84041
Fixed merge conflict
2018-02-03 09:14:53 +05:30
Nabin Hait
9d2f04139c
bumped to version 10.0.19
2018-02-03 09:43:12 +06:00
Helkyd
5e93b02c85
Update trial_balance.py
...
Assuming that Account_number has NUMBERs will sort.
2018-02-02 12:27:30 +00:00
Saurabh
70d972d92e
[Mod] Added descriptions to alert about reselecting the option in 'primary_address_and_contact_detail'
2018-02-02 16:18:17 +05:30
Saurabh
41c47e3ffa
Merge pull request #12677 from tundebabzy/issue-12535-1
...
Website Cart Should Not Show Expired Items As 'In Stock' #12535
2018-02-02 15:58:07 +05:30
rohitwaghchaure
cf6360d825
Merge pull request #12739 from jay-parikh/hotfix
...
Enable/Disable Discount in POS using POS Profile #11748
2018-02-02 13:12:38 +05:30
Jay Parikh
2c95ab3897
Code fix for Enable/Disable Discount in POS using POS Profile #11748
2018-02-01 22:52:58 -08:00
Jay Parikh
171e5af995
Fixed indentation issue in pull # 11748
2018-02-01 21:39:20 -08:00
tundebabzy
5df64d84a1
code review fix
2018-02-01 17:05:54 +01:00
tundebabzy
a829d5a4d5
Merge branch 'hotfix' into issue-12535-1
2018-02-01 16:56:05 +01:00
Helkyd
b258686b00
Update trial_balance.py
...
Fix to order only if account starts with Number ... while for others not required....
2018-02-01 15:53:30 +00:00
Nabin Hait
91c5e4c429
Validate rate in PO with supplier quotation only if checking is enabled via Buying Settings ( #12734 )
2018-02-01 18:58:22 +05:30
Nabin Hait
cae13bf048
Fixes in purchase register report ( #12737 )
2018-02-01 18:58:14 +05:30
Nabin Hait
2aba97bff1
Fetch items from BOM in Material Request
2018-02-01 18:52:50 +05:30
Jay Parikh
d4359faa31
Enable/Disable Discount in POS using POS Profile #11748
2018-02-01 04:26:24 -08:00
Rohit Waghchaure
d85247cd7a
[Fix] Pay button not working in pos
2018-02-01 17:18:38 +05:30
rohitwaghchaure
441032d39c
Merge branch 'develop' into develop
2018-02-01 16:54:10 +05:30
Nabin Hait
b9ce104b09
Opening balance in stock ledger report ( #12729 )
2018-02-01 14:58:50 +05:30
Saurabh
7c8d508e28
[Mod] Dependant on complete_address field and loads updated mobile_no,address in onload method
2018-02-01 14:40:49 +05:30
Saurabh
df8add272c
Merge branch 'develop' of https://github.com/frappe/erpnext into show_address_in_online_pos
2018-02-01 14:02:09 +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
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
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
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
Zlash65
f7a4d4221b
check precision with qty
2018-01-29 18:47:21 +05:30
Shreya Shah
406d449e12
fix posting date in journal entry on load ( #12694 )
2018-01-29 18:01:20 +05:30
Saurabh
d581ff40ea
Merge branch 'master' into develop
2018-01-29 17:42:37 +05:30
Saurabh
373066e0ca
bumped to version 10.0.16
2018-01-29 18:12:37 +06:00
rohitwaghchaure
52beb77539
Don't validate payment terms for POS ( #12692 )
2018-01-29 17:40:44 +05:30
Saurabh
e1e690541c
set payment term name in payment_terms ( #12693 )
2018-01-29 17:39:56 +05:30
Ameya Shenoy
471e27559f
conflict fix
2018-01-29 17:07:57 +05:30
rohitwaghchaure
86c7ede321
Merge pull request #12690 from rohitwaghchaure/subscription_sent_email_issue
...
[Fix] Subscription send notification issue
2018-01-29 17:01:00 +05:30
Rohit Waghchaure
7e033aae11
[Fix] Subscription send notification issue
2018-01-29 16:53:37 +05:30
Zarrar
5bf77beb83
precision while checking qty ( #12688 )
2018-01-29 16:47:52 +05:30
Nabin Hait
1e1b2364ab
Optimization: don't update outstanding amount while cancelling payment entry for advance adjustment ( #12689 )
2018-01-29 16:45:43 +05:30
Cesar
58c040cffb
Revert "Sort by account name"
...
This reverts commit 5cf01d9702
2018-01-29 11:57:15 +01:00
Saurabh
03f6b3e588
resolved merge conflicts
2018-01-29 16:25:33 +05:30
Saurabh
05eed01eec
bumped to version 10.0.15
2018-01-29 16:54:55 +06:00
Cesar
5cf01d9702
Sort by account name
...
Trial balance not sorted .. by adding those changes fixes the problem.
2018-01-29 11:54:12 +01:00
Nabin Hait
cfa9d1adb7
Patch: Create Payment Terms based on default credit days set in company and use it while setting due_date ( #12685 )
...
* Patch: Create Payment Terms based on default credit days set in company and use it while setting due_date
* Payment Terms patch for credit days defined in customer group
2018-01-29 16:07:21 +05:30
rohitwaghchaure
c385017056
Merge pull request #12638 from adityaduggal/develop
...
Resolves Issue #12630 -Added Filters to AR
2018-01-29 12:37:39 +05:30
rohitwaghchaure
d36ac27f94
Update accounts_receivable.py
2018-01-29 12:35:19 +05:30
rohitwaghchaure
62b31bf708
Update accounts_receivable.py
2018-01-29 12:34:19 +05:30
tundebabzy
c7c1defe64
after adjusting stock_qty for expired, set in_stock flag
2018-01-27 12:16:13 +01:00
tundebabzy
c14f1f145b
adjust stock_qty for expired quantities
...
adjust based on warehouse
add parameters to `get_qty_in_stock` so it can be useful in other parts of the code base
2018-01-27 12:16:13 +01:00
tundebabzy
794ecda618
corrected wrong get_diff arguments
2018-01-27 05:54:40 +01:00
Charles-Henri Decultot
241b09ee11
Addition of index.txt
2018-01-26 07:53:59 +00:00
Charles-Henri Decultot
d0c2f7b754
Doc file rename
2018-01-26 07:09:11 +00:00
Vishal Dhayagude
c463c0684d
[Report] GSTR - 1 CDNR Report ( #12554 )
...
* [wip] cdnr
* [WIP] cdnr with optional data
* [wip] Export GSTR-1
* [minor] Minor changes in export
* [new] Custom field added for GST
* [fix] Minor changes in GSTR1 Report
* [minor] Minor changes in gstr1
* [fix] Codacy Fixed
* Update setup.py
2018-01-26 11:27:22 +05:30
Manas Solanki
8985077652
Assessment Module Report ( #12605 )
...
* updated course wise assessment report
* added new report Final assessment grades
2018-01-26 11:20:33 +05:30
Andy Villiger
567623654b
Resolve issue #10914 - Error when making Sales Invoice ( #12656 )
...
* Resolve issue #10914
An exception was raised when a Sales Order has been created to a Sales Invoice and one of the items had no Item Code.
* Update sales_order.py
2018-01-26 11:11:19 +05:30
tundebabzy
db4fd7f5b6
Improvements to batch auto naming ( #12496 )
...
* refactor:
add new function - batch_uses_naming_series
use batch_uses_naming_series in autoname method
* properly update naming series on delete:
- add new functions - get_batch_prefix, get_batch_naming_series_key, get_batch_naming_series
- refactor get_name_from_naming_series
- add after_delete method
* add documentation and rename some functions
* PEP 8 compliance
* test
2018-01-26 11:00:20 +05:30
rohitwaghchaure
bfa898ff9b
[Fix] System pull the valuation rate even if allow zero valuation rate is enabled ( #12537 )
2018-01-26 10:59:00 +05:30
tundebabzy
0a33a359ca
Merge pull request #12659 from tundebabzy/issue-12658
...
set batch number only in Sales Invoice and Delivery Note - #12659
2018-01-26 06:10:13 +01:00
tundebabzy
f9b5c74871
set batch number only in Sales Invoice and Delivery Note
2018-01-25 19:21:05 +01:00
Prateeksha Singh
4c58299eb0
[fix] encode if letterhead
2018-01-25 17:29:57 +05:30
Saurabh
aaaf5c62b6
[Mod] Minor changes in 'primary_address' field's property
2018-01-25 17:28:57 +05:30
rohitwaghchaure
3574c96c8c
Update item_dashboard_list.html
2018-01-25 17:11:52 +05:30
Shreya
1416567139
patch fix for leave-workflow
2018-01-25 17:06:14 +05:30
Vinayak Jethe
5743ce2b6b
Made changes as per suggestions
2018-01-25 13:37:20 +05:30
Saurabh
6614d8aa01
Multiple changes:
...
[Mod] Added 'primary_address_and_contact_detail' in toggle_display
[Mod] Added a description for 'primary_address_and_contact_detail'
2018-01-25 12:27:00 +05:30
Saurabh
5a2354149c
Merge branch 'develop' of https://github.com/frappe/erpnext into show_address_in_online_pos
2018-01-25 11:56:36 +05:30
Shreya
5f264fa364
fixes
2018-01-24 20:39:30 +05:30
Vinayak Jethe
84f7727432
Merge branch 'hotfix' of https://github.com/frappe/erpnext into fix-to-issue-#12512
2018-01-24 19:48:24 +05:30
Vinayak Jethe
549c196beb
Fixes issue #12512
2018-01-24 19:47:59 +05:30
Shreya
61cf49dd07
workflow patch fix
2018-01-24 18:50:01 +05:30
Aditya Duggal
2136a7bded
Resolves Issue #12630 -Added Filters to AR
...
- Added Territory Filter to AR report
- Added Sales partner filter
- Added Sales person filter
-Terrtory filter is needed since if you need to see AR in North Inda you get with filter not with column
-Similarly there was a need for Sales Partner and sales person filter in the AR report which is being fulfilled now.
2018-01-24 18:16:08 +05:30
Saurabh
cadd31cb0c
[Fix] Solves issue #12588
2018-01-24 16:38:22 +05:30
rohitwaghchaure
8df0556af5
Merge pull request #12587 from shreyashah115/leave-workflow
...
Refactor Leave Application
2018-01-24 15:04:17 +05:30
Shreya
a8a952deff
check if workflow_state_name already exists
2018-01-24 15:00:54 +05:30
Rushabh Mehta
29bc14d242
[fix] ficher_des_ecritures patch
2018-01-24 14:39:04 +05:30
Vinayak Jethe
46c82c45e0
Revised changes for codacy
2018-01-24 14:24:58 +05:30
Shreya
a309a871b5
Codacy fix
2018-01-24 13:56:16 +05:30
Vinayak Jethe
2c8ce5a717
Fixes issue #12512
2018-01-24 13:51:26 +05:30
Shreya
a400e7b568
Fixed as per the review
2018-01-24 13:30:20 +05:30
Saurabh
fb2f97391f
resolved merge conflicts
2018-01-24 11:24:10 +05:30
Saurabh
381d452b78
bumped to version 10.0.14
2018-01-24 11:52:53 +06:00
Saurabh
6cc10104f0
[fix] enable rename for payment terms and payment term template
2018-01-24 11:15:02 +05:30
rohitwaghchaure
56a4f9205a
Merge pull request #12620 from mntechnique/draft-mode-print
...
Print Functionality in Online POS using allow print before pay check
2018-01-24 10:54:07 +05:30
Saurabh
9c6bf08e77
Merge pull request #12547 from joshreeder/patch-1
...
Update dropbox-backup.md
2018-01-24 07:57:15 +05:30
Saurabh
4b9a55b0ef
[fix] If buying or selling price list not found, return empty dict
2018-01-24 07:48:56 +05:30
Saurabh
b665baec72
Used cint instead of int
2018-01-23 18:28:05 +05:30
Saurabh
c8399fd093
Merge pull request #12614 from rohitwaghchaure/removed_set_only_once_for_batch_serialno
...
Disabled property set only once for has serial no and has batch no field in item doctype
2018-01-23 18:08:56 +05:30
Rohit Waghchaure
266e66cd1b
Disabled property set only once for has serial no and has batch no field in item doctype
2018-01-23 18:06:12 +05:30
Saurabh
a5c9fc3705
Removed commented code
2018-01-23 17:36:41 +05:30
rohitwaghchaure
f3a452850e
Merge pull request #12617 from saurabh6790/ux_fix
...
parse value before setting it to dissable_rounded_total on Purchase Invoice
2018-01-23 17:35:16 +05:30
Saurabh
6c5f5b20cf
Merge branch 'develop' of https://github.com/frappe/erpnext into draft-mode-print
2018-01-23 17:33:21 +05:30
Charles-Henri Decultot
e31e1239ba
FEC report for France ( #12446 )
...
* FEC report for France
* Codacy correction
2018-01-23 17:23:27 +05:30
Jamsheer
58af1db0d7
Patient Appointment - Check appointment day is holiday or physician on leave ( #12556 )
2018-01-23 17:23:27 +05:30
Shreya Shah
673b59b114
Updated docs for Payroll Entry ( #12552 )
...
* updated docs for payroll entry
* fixed a link in employee-advance doc
2018-01-23 17:23:27 +05:30
Shreya
543feda2fb
set posting date only if null
2018-01-23 17:23:27 +05:30
Saurabh
cbbee47625
[Fix] Resolved the type issue of 'is_saved' flag variable
2018-01-23 17:23:27 +05:30
Saurabh
a2076a1ff0
Multiple changes:
...
[Mod] Used async-await for asynchronous save in draft mode
[Fix] Fixed bug that din't allow to submit a new POS Invoice
2018-01-23 17:23:26 +05:30
Saurabh
c5a6cf3a0e
[Mod] Allows print only when the check value exists and the cart isn't empty
2018-01-23 17:23:26 +05:30
Saurabh
3a609108ae
Codacy changes
2018-01-23 17:23:26 +05:30
Saurabh
32695a938f
[Mod] Refactored the code for fetching allow_print_before_pay check value
2018-01-23 17:23:26 +05:30
deepak-mnt
d7da89bf5a
[Fix] Resolved issues suggested by Codacy
2018-01-23 17:21:44 +05:30
deepak-mnt
8f3d394485
Minor changes:Removed extra spaces in py code
2018-01-23 17:21:44 +05:30
deepak-mnt
cc813d2286
[Mod] Ensured that a single POS Sales Invoice is created even when its printed(saved) in Draft mode
2018-01-23 17:21:44 +05:30
deepak-mnt
1ccb0cfa2f
[Mod] point_of_sale.js: Allowed print before pay and saved the invoice before print
...
[New] test_point_of_sale.js: Test Cases to check the print before pay functionality in Online POS
2018-01-23 17:21:44 +05:30
deepak-mnt
29abe291c9
Allow draft mode print in online POS
2018-01-23 17:21:44 +05:30
Saurabh
57df096725
Merge pull request #12600 from vishdha/allow_rename
...
[new] Allow Rename and Member link with user
2018-01-23 16:49:48 +05:30
Shreya
dfae11bcee
disabled warehouse in list view
2018-01-23 16:46:24 +05:30
Rushabh Mehta
b5a3df920c
[fix] primary button color for make
2018-01-23 16:08:52 +05:30
rohitwaghchaure
d78e6e04ea
Run country fixtures if country changed in the company ( #12494 )
2018-01-23 15:42:46 +05:30
Saurabh
3959aeb848
[fix] parse value before setting it to dissable_rounded_total on Purchase Invoice
2018-01-23 15:40:43 +05:30
Charles-Henri Decultot
90657fb566
FEC report for France ( #12446 )
...
* FEC report for France
* Codacy correction
2018-01-23 15:40:14 +05:30
Jamsheer
d63b7e16af
Patient Appointment - Check appointment day is holiday or physician on leave ( #12556 )
2018-01-23 15:38:34 +05:30
Shreya Shah
3191951bff
Updated docs for Payroll Entry ( #12552 )
...
* updated docs for payroll entry
* fixed a link in employee-advance doc
2018-01-23 15:37:23 +05:30
rohitwaghchaure
881d32c4b8
Merge pull request #12540 from shreyashah115/posting-date
...
[Payroll Entry] Set posting date only if null
2018-01-23 15:10:26 +05:30
rohitwaghchaure
f8a98f5eeb
Merge pull request #12609 from britlog/payment-request-translation
...
[Stripe] Translate payment request subject
2018-01-23 14:47:55 +05:30
rohitwaghchaure
b607c6f8b2
Merge pull request #12610 from MaxMorais/patch-7
...
Serial No, wont relates to the warehouse
2018-01-23 14:46:46 +05:30
Frappe PR Bot
48d4a0a438
[Translation] Updated Translations ( #12613 )
2018-01-23 14:35:52 +05:30
rohitwaghchaure
51293390e4
Merge pull request #12611 from shreyashah115/fetch-conversion-factor
...
[Fix] Fetch uom conversion factor in material request
2018-01-23 12:41:01 +05:30
pawan
9b7093e4d6
validation code improvement
2018-01-23 11:39:53 +05:30
Shreya
a137fe82a1
fix error message
2018-01-23 11:00:58 +05:30
Shreya
e2b31085a7
fetch uom conversion factor in material request
2018-01-23 10:54:23 +05:30
Maxwell Morais
7cffd618ab
Serial No, wont relates to the warehouse
...
The serial no, picker wont follow the target serial no
2018-01-22 22:33:28 -02:00
britlog
ddd2bc9aac
Translate payment request subject
2018-01-22 23:23:31 +01:00
pawan
6a8eba891e
Move target warehouse validation to submit
2018-01-23 00:57:44 +05:30
pawan
afab0a64e5
code alignment
2018-01-22 17:34:27 +05:30
pawan
4ab6ef89a1
code alignment
2018-01-22 17:31:40 +05:30
pawan
67867529c0
[fix] #8540
2018-01-22 17:08:39 +05:30
Vishal
a54815fd9d
[new] Allow Rename and Member link with user
2018-01-22 16:02:45 +05:30
Saurabh
ef31637549
Merge branch 'master' into develop
2018-01-22 15:29:15 +05:30
Saurabh
b9f678b350
bumped to version 10.0.13
2018-01-22 15:59:14 +06:00
Saurabh
fb4caff0b2
Merge pull request #12573 from rohitwaghchaure/reorder_issue
...
[Fix] Wrong projected qty for warehouse group in the process of reorder item, which making extra material requests
2018-01-22 16:49:54 +07:00
Saurabh
e72915847c
Merge pull request #12570 from rohitwaghchaure/currency_in_balance_column
...
Added currency in balance column in general ledger print
2018-01-22 16:35:37 +07:00
rohitwaghchaure
1d93bd50eb
Merge pull request #12585 from rohitwaghchaure/sales_income_account_issue
...
[Fix] Income account can not be group
2018-01-22 15:04:46 +05:30
rohitwaghchaure
8e998875a5
Merge pull request #12590 from shreyashah115/total-on-items-remove
...
[Fix] Calculate taxes when shipping rule not present at removal of item
2018-01-22 15:03:11 +05:30
Shreya
5164997db7
delete column status
2018-01-22 14:13:03 +05:30
Rohit Waghchaure
c4c2bf0bfb
[Fix] Image patch showing in the item link
2018-01-22 13:47:28 +05:30
Shreya
39adc8f85f
calculate total when items are removed
2018-01-22 13:08:05 +05:30
Rohit Waghchaure
8676590cfe
[Fix] Income account can not be group
2018-01-22 12:35:36 +05:30
Shreya
dd66bc03c7
fixes
2018-01-22 12:28:38 +05:30
Shreya
fc0e8e5c6a
modified patches.txt
2018-01-22 12:26:41 +05:30
Shreya
4298bcfa40
modified leave application tests
2018-01-22 12:26:41 +05:30
Shreya
05f7e14b5a
replaced status with workflow_state
2018-01-22 12:26:41 +05:30
Shreya
117ddac033
patch to create workflow for existing leave applications
2018-01-22 12:26:41 +05:30
Josh Reeder
c8b9648c53
Changed instructions
...
No need to copy and paste into text editor, problems with error message have to do with the form needing saved before Allow Access button is used.
2018-01-20 15:56:15 -06:00
Rohit Waghchaure
bc94914338
[Fix] Sales payment summary issue
2018-01-20 17:01:31 +05:30
Rohit Waghchaure
f83f6aae22
[Fix] Wrong projected qty for warehouse group in the process of reorder item making extra material requests
2018-01-20 15:44:38 +05:30
Rohit Waghchaure
edef642794
Added currency in balance column in general ledger print
2018-01-20 12:54:25 +05:30
Saurabh
24946ee4e0
Codacy fix
2018-01-20 04:28:35 +05:30
Saurabh
b664488d98
[Fix] Clears off the read-only fields in 'Primary Address and Contact Details' Section on blank link fields
2018-01-20 03:12:45 +05:30
Saurabh
24cae1cad6
Made Primary address field searchable and is displayed in Customer Link field options
2018-01-20 02:47:19 +05:30
britlog
d13985d1d0
Add number spinner for quantity
2018-01-19 18:31:25 +01:00
Zlash65
93344dff26
group_by_account not displayed fix
2018-01-19 19:06:39 +05:30
Rohit Waghchaure
abc0632925
Merge branch 'master' into develop
2018-01-19 15:49:29 +05:30
Rohit Waghchaure
0e61b52022
bumped to version 10.0.12
2018-01-19 16:19:28 +06:00
rohitwaghchaure
0efd7934b8
Merge pull request #12530 from frappe/manassolanki-patch-2
...
Issue in the data import while importing the invoice
2018-01-19 15:35:23 +05:30
Rohit Waghchaure
c987500e08
Merge branch 'master' into develop
2018-01-19 13:29:57 +05:30
Rohit Waghchaure
e1815f0989
bumped to version 10.0.11
2018-01-19 13:59:56 +06:00
rohitwaghchaure
c59d52d073
Merge pull request #12550 from rohitwaghchaure/po_permission_issue
...
[Fix] Error in PO. No Permission for Buying Settings
2018-01-19 13:00:36 +05:30
rohitwaghchaure
7b605a628e
Merge pull request #12543 from rohitwaghchaure/precision_issue_bom
...
[Fix] Precision issue while making material requests from production planning tool
2018-01-19 13:00:16 +05:30
Rohit Waghchaure
2f3ad64bd6
[Fix] Precision issue while making material requests from production planning tool
2018-01-19 12:47:55 +05:30
Rohit Waghchaure
86cbde9057
[Fix] Error in PO. No Permission for Buying Settings
2018-01-19 12:45:53 +05:30
rohitwaghchaure
65a669c81e
Merge pull request #12534 from rohitwaghchaure/patch_fix_v7
...
[Fix] Timesheet patch
2018-01-19 11:37:18 +05:30
Josh Reeder
4c38e67f1a
Update dropbox-backup.md
...
Steps for open source users were wrong and there were many work arounds. i have updated the instructions with the most streamlined process.
2018-01-18 15:38:59 -06:00
Shreya
d0b60e8254
set posting date only if null
2018-01-18 17:35:29 +05:30
Rohit Waghchaure
de420322b5
[Fix] Sales payment summary issue
2018-01-18 17:20:21 +05:30
rohitwaghchaure
c8e016522d
Merge pull request #12533 from rohitwaghchaure/pos_css_issue
...
[Fix] POS css
2018-01-18 16:12:00 +05:30
Rohit Waghchaure
5c4f52ccf1
[Fix] POS css
2018-01-18 16:10:19 +05:30
Rohit Waghchaure
95adb60a8f
Fix patch
2018-01-18 15:52:52 +05:30
Manas Solanki
c6d5611408
Issue in the data import while importing the invoice
2018-01-18 11:20:24 +05:30
rohitwaghchaure
bd47abdc9a
[Enhance] Running Balance in GL Report ( #12491 )
...
* Running Balance in GL Report
* Supplier invoice no in GL Report/Print Format
2018-01-18 09:32:43 +05:30
Faris Ansari
00e547d319
Encode letterhead filename ( #12525 )
2018-01-18 09:28:13 +05:30
Nabin Hait
f1b098e03c
payment terms filter in AR Summary report ( #12529 )
2018-01-18 09:23:32 +05:30
Nabin Hait
570e29d5e7
Fixed merge conflict
2018-01-17 18:56:02 +05:30
Nabin Hait
f76fb50685
bumped to version 10.0.10
2018-01-17 19:21:20 +06:00
rohitwaghchaure
da941af687
Set due date in purchase invoice based on suppler invoice date ( #12395 )
2018-01-17 16:23:04 +05:30
Nabin Hait
91fd29a963
Remove enqueuing update_total_sales method, sometimes it does not include current invoice ( #12522 )
2018-01-17 16:14:31 +05:30
Kenneth Sequeira
7030817bf2
fixed image links in role based permissions and user permisissions. Fixed a spelling mistake in user permissions ( #12500 )
2018-01-17 16:13:28 +05:30
Gaurav Naik
dc0db3a652
Exploded view for BOM Stock Report ( #12506 )
...
* Multilevel BOM Stock Report prototype
* Rechristened multilevel to exploded view
* Removed trailing whitespace in line 16. Replaced spaces with tabs for indentation
* Used BOM Explosion item in query for exploded view
* Removed trailing whitespaces for Codacy compliance
2018-01-17 16:12:55 +05:30
Umair Sayed
d8b4c8bd5b
Update index.txt ( #12507 )
2018-01-17 16:12:00 +05:30
Raghavendra Kamath
2967ec3d45
Add desk icons for healthcare - fixes 11838 ( #12518 )
...
* Add desk icons for healtcare - fixes 11838
* Remove unnecessary white spaces
2018-01-17 16:11:09 +05:30
Umair Sayed
230805b016
Update total.html ( #12511 )
2018-01-17 14:41:38 +05:30
rohitwaghchaure
60febc5465
[Fix] Gross profit validation issue ( #12516 )
2018-01-17 14:40:59 +05:30
Faris Ansari
4d4ce3e5cf
Rename enquiry_type to opportunity_type in MultiSelect dialog ( #12517 )
2018-01-17 14:40:27 +05:30
Vishal Dhayagude
052b51ab20
[fix] Fetch UOM conversion and stock_uom from BOM into material request ( #12513 )
...
* [fix]Fetch UOM conversion and stock_uom from BOM into material Request
* Update material_request.js
2018-01-17 14:39:54 +05:30
Nabin Hait
2bfa1803e9
GL Entry on asset sale ( #12514 )
...
* GL Entry on asset sale
* Asset sale test case fixed
2018-01-17 14:39:05 +05:30
Nabin Hait
b44ef0b249
Delete employee records on deletion of company
2018-01-16 19:21:02 +05:30
frappe-pr-bot
f12dfe7b7c
[Translation] Updated Translations
2018-01-16 09:37:11 +02:00
Saurabh
4b0dd8a159
Merge branch 'master' into develop
2018-01-15 18:36:35 +05:30
Saurabh
d40bfeb7d3
bumped to version 10.0.9
2018-01-15 19:06:34 +06:00
Faris Ansari
f18cd2eaf7
[fix] is_root check
2018-01-15 18:30:01 +05:30
Nabin Hait
a2426fcc9e
Get default tax template only if tax template not selected or template is for other company ( #12492 )
2018-01-15 17:45:46 +05:30
umaepoch
832453a757
Added Delay days field to Ordered Items to be Delivered report ( #12439 )
...
* Added Delay Days to Ordered Items to be Delivered Report
* Ordered Items to be Delivered
2018-01-15 15:43:16 +05:30
Faris Ansari
184491bbbe
[hotfix] Validate posting_time ( #12484 )
2018-01-15 14:18:53 +05:30
Achilles Rasquinha
b6365b729e
Deleted Previous Chat Reference for Leave Application Approval ( #12482 )
...
* deleted previous chat reference
* txt to messge
* removed comment
2018-01-15 14:12:41 +05:30
Vishal Dhayagude
eec0f7fd6b
[non_profit][fix] Chapter listing and join and leave chapter issue ( #12463 )
...
* [fix] Chapter listing and Join and leave chapter issue
* [minor] Changes in chapter html, chapter title to chapter name
2018-01-15 14:10:23 +05:30
Vishal Dhayagude
e04aedadcd
[fix] Add to cart issue fixed ( #12474 )
2018-01-15 14:01:05 +05:30
ci2014
58dfc0782f
Update agriculture_analysis_criteria.json ( #12478 )
2018-01-15 12:33:03 +05:30
Vishal Dhayagude
e88f928f0f
[fix] Image with name listing ( #12479 )
2018-01-15 12:29:39 +05:30
Manas Solanki
e5e5d8271f
Update utils.py
2018-01-15 12:22:28 +05:30
rohitwaghchaure
0a2d83d40c
[Fix] gst_state field issue ( #12481 )
2018-01-15 11:55:25 +05:30
Saurabh
35d8ce4fbd
resolved merge conflicts
2018-01-12 16:58:32 +05:30
Saurabh
59edc6028d
bumped to version 10.0.8
2018-01-12 17:24:26 +06:00
Saurabh
93d3020e4b
Merge pull request #12464 from Zlash65/fix-company-bom-deletion
...
[Fix] Delete BOM only when found
2018-01-12 16:47:54 +05:30
tundebabzy
e1e38a4bb9
Autoname for Batch DocType #12302 ( #12461 )
...
* add new fields:
check: use naming series
data: series prefix
* refactor autoname:
use new function - get_name_from_hash
* add new function - get_name_from_naming_series
* refactor autoname to generate name from naming series
* PEP 8 compliance
2018-01-12 16:30:02 +05:30
Manas Solanki
b19fd57043
[fix] set required quantity if item in bom found ( #12460 )
2018-01-12 16:28:30 +05:30
rohitwaghchaure
7b78f6bee6
Added rounded total in the POS and fix rounded issue in js side ( #12457 )
2018-01-12 16:28:16 +05:30
tundebabzy
df023bff7f
add posting_date/transaction_date to list_view ( #12453 )
2018-01-12 16:27:29 +05:30
rohitwaghchaure
9fbed5617f
[Fix] Wrong batch showing in the popup ( #12421 )
2018-01-12 16:22:33 +05:30
Manas Solanki
bba5fd7a38
Assessment module addition ( #12417 )
...
* add academic session details in the Assessmet Plan
* add the academic session and few details in the assessment result
* fix codacy
2018-01-12 16:21:09 +05:30
Zlash65
c9172e0079
delete boms only when found
2018-01-12 15:59:13 +05:30
Manas Solanki
6c3082591c
change the resolution field to the text editor ( #12449 )
2018-01-12 12:00:13 +05:30
Nabin Hait
a49f720ee3
GSTR1 for B2B, B2CL and B2CS ( #12459 )
2018-01-12 11:59:59 +05:30
rohitwaghchaure
3955fa5102
[Fix] Email addres unique key issue ( #12450 )
2018-01-11 18:21:02 +05:30
joezsweet
3aaed03dfb
reload item_barcode
2018-01-11 11:31:31 +01:00
joezsweet
1be684fd87
codici fix
2018-01-11 09:03:26 +01:00
joezsweet
b6fb8d2143
fix patch, reload doc
2018-01-11 08:44:59 +01:00
rohitwaghchaure
02302ff009
[Fix] Incoming rate for gross profit report ( #12422 )
2018-01-11 12:58:46 +05:30
Sachin Mane
24e2735e19
Add 'Shelf Life' (Item) and Manufacturing date (Batch) ( #12381 )
...
* fix bug in batch number selector. fetch and display batch numbers only for the given item code.
* remove print statement
* Fix error on selecting Chattisgarh in address
Fix error on selecting Chattisgarh in address because of spelling mistake
* Revert "Fix error on selecting Chattisgarh in address"
* Add Shelf Life (Item) and Manufacturing Date (Batch) fields
* remove console.log
* fix ci issues
* Update batch.js
2018-01-11 12:45:50 +05:30
rohitwaghchaure
5b45bcf5f3
[Fix] Report Available Stock for Packing Items Menu not working ( #12400 )
2018-01-11 12:39:09 +05:30
rohitwaghchaure
20dead5d91
[minor] UI change ( #12440 )
...
* [minor] UI change
* Update company.js
2018-01-11 12:31:14 +05:30
Charles-Henri Decultot
47ad7fb129
Multiple variant correction ( #12424 )
2018-01-11 12:29:45 +05:30
rohitwaghchaure
752d21e658
Code cleanup for item price stock report and fix report was not exporting properly in excel ( #12427 )
2018-01-11 12:28:48 +05:30
Vishal Dhayagude
a48f69eb83
[minor] Modified GSTR1 report to identify missing GST Account in GST Settings ( #12426 )
...
* [minor] Modified GSTR1 report to identify missing GST Account in GST Settings
* Update gstr_1.py
2018-01-11 12:26:52 +05:30
Rushabh Mehta
8be6d74655
[minor] company.js buttons should be primary!
2018-01-11 11:20:16 +05:30
tundebabzy
3732033d9b
Merge pull request #12435 from tundebabzy/packing-slip-msg
...
Better validation message in Packing Slip
2018-01-11 00:32:26 +01:00
tundebabzy
6f75885d86
better validation message
2018-01-10 23:14:13 +01:00
joezsweet
9116666288
fix patch
2018-01-10 23:11:13 +01:00
tundebabzy
76dddbf26e
Merge branch 'develop' into multi-barcode
2018-01-10 21:49:27 +01:00
Nabin Hait
619c42b934
GSTR1 for B2B ( #12296 )
2018-01-10 17:48:03 +05:30
Vishal Dhayagude
0099a09e9b
[fix] fix print hide weight details in quotation print format ( #12412 )
2018-01-10 16:30:09 +05:30
Zarrar
94f9f48d70
set from_warehouse only if purchase_order and purpose found ( #12398 )
2018-01-10 16:29:40 +05:30
Nabin Hait
687dc6a424
patch fixed
2018-01-10 14:51:19 +05:30
frappe-pr-bot
a20ef08ebf
[Translation] Updated Translations
2018-01-09 13:29:17 +02:00
Nabin Hait
527e6c02b3
Delete BOMs on deletion of company
2018-01-09 16:29:13 +05:30
Nabin Hait
6b89644ca7
Payment terms filter in AR report
2018-01-09 15:39:35 +05:30
Pawan Mehta
d0e7367525
[fix] #12390 ( #12391 )
2018-01-09 14:33:25 +05:30
Saurabh
892a7a6980
resolved merge conflicts
2018-01-09 12:05:20 +05:30
Saurabh
0b3b63a9af
bumped to version 10.0.7
2018-01-09 12:25:38 +06:00
rohitwaghchaure
412e044e8f
[Fix] Error in stock move from batch dashboard ( #12377 )
2018-01-09 11:27:35 +05:30
Zarrar
0f458b1260
show balance if permitted to view gl entry ( #12385 )
2018-01-09 11:27:14 +05:30
tundebabzy
da22167741
Purchase Invoice - Due Date reverts to first time value on save #12340 ( #12382 )
...
* add handler for due_date:
if due_date is changed and payment terms template or payment schedule is set,
ask user to clear them.
* ui test cases
* cleanup
2018-01-09 10:58:44 +05:30
Vishal Dhayagude
d2d54826ab
[minor] Minor Changes in Membership Doctype ( #12384 )
2018-01-09 10:56:17 +05:30
Pawan Mehta
5b069a4e25
Added Payment Details to Sales Payment Summary Report ( #12358 )
...
* [fix] #12357
* label changes
2018-01-09 10:53:13 +05:30
Sachin Mane
64f48db406
Batch number selector bug fix ( #12346 )
...
* fix bug in batch number selector. fetch and display batch numbers only for the given item code.
* remove print statement
* Fix error on selecting Chattisgarh in address
Fix error on selecting Chattisgarh in address because of spelling mistake
* Revert "Fix error on selecting Chattisgarh in address"
2018-01-08 17:57:32 +05:30
Prateeksha Singh
8b94f1b553
[minor][buying] fix schedule date check ( #12375 )
2018-01-08 16:46:39 +05:30
rohitwaghchaure
7fcc21bc8b
[Fix] Cart remain same even if pos profile change ( #12371 )
2018-01-08 15:22:22 +05:30
rohitwaghchaure
bf4c114c58
[Enhance] Provision to show inclusive tax in print ( #12345 )
...
* [Enhance] Provision to show inclusive tax in print
* POS Print format
2018-01-08 15:20:15 +05:30
Shreya Shah
44fa9a6d9d
Last purchase rate button added back ( #12135 )
...
* last purchase rate button added
* triggers to update rate on button
* updated modified column in buying settings
* moved trigger to get_item_details.py
* hide get_last_rate button depending on buying settings
2018-01-08 14:58:20 +05:30
Prateeksha Singh
50b6d79758
Merge pull request #12370 from Zlash65/fix-root-node-delete
...
[Fix] Delete root node for account
2018-01-08 12:51:31 +05:30
Nabin Hait
3a972c4d85
Precision issue in stock reconciliation
2018-01-08 12:35:05 +05:30
Zlash65
745c2658eb
delete root node allow
2018-01-08 11:53:52 +05:30
Charles-Henri Decultot
57187860f8
Codacy error fixes
2018-01-06 15:32:01 +00:00
Charles-Henri Decultot
356839a54b
Codacy erro fixes
2018-01-06 15:22:40 +00:00
ci2014
5d3e486415
Fix english typo in source code
...
Fix english typo in source code
2018-01-06 04:04:06 +01:00
Charles-Henri Decultot
34e335ba34
Prorated Asset Depreciation
2018-01-05 17:49:06 +00:00
Prateeksha Singh
620e0981cb
Merge pull request #12347 from pratu16x7/buying-fix
...
[minor][buying] fix schedule date check
2018-01-05 21:31:58 +05:30
Prateeksha Singh
cbd06fd3c6
[minor][buying] fix schedule date check
2018-01-05 21:28:01 +05:30
Nabin Hait
2f51c6900b
Fixes and cleanups of reserve qty for subcontracting
2018-01-05 18:20:05 +05:30
Nabin Hait
07e5376043
Fixes and cleanups of reserve qty for subcontracting
2018-01-05 18:19:59 +05:30
Nabin Hait
cab8dfc5fb
Fixed merge conflict
2018-01-05 14:15:39 +05:30
Nabin Hait
cb495fb33b
Merge branch 'master' into develop
2018-01-05 13:17:00 +05:30
Nabin Hait
c98cfbdab4
bumped to version 10.0.6
2018-01-05 13:46:59 +06:00
Nabin Hait
28d0230e56
Multiple small fixes
2018-01-05 13:14:25 +05:30
James Robertson
46196c4ad3
Setup Wizard Updates ( #12337 )
...
Changes to support v10 ERPNext Setup Wizard
2018-01-05 12:50:04 +05:30
Saurabh
eac2e369cf
[fix] setup alias for ifnull condition ( #12327 )
2018-01-05 12:48:08 +05:30
Doridel Cahanap
291b26ad04
Training Documentation in DE ( #12309 )
2018-01-05 12:47:40 +05:30
Manas Solanki
a521efc990
fix for the non stock items for the shopping cart ( #12294 )
2018-01-05 12:47:20 +05:30
tundebabzy
8f44d1c63d
Payment Terms in Delivery Note #12167 ( #12293 )
...
* add Payment Terms Template field to delivery note:
- This helps for users who create invoice from Sales Invoice
- Field is hidden in print
- Field is not coupled to Payment Schedule table.
* do nothing in payment_terms_template trigger if doctype is Delivery Note
2018-01-05 12:46:50 +05:30
Shreya Shah
48351e0339
cancelled sales invoice totals shouldn't be reflected in leaderboard for customer ( #12292 )
2018-01-05 12:45:43 +05:30
Manas Solanki
171157f1b3
Fix + Enhancement in Program Enrollment Tool ( #12291 )
...
* Fix + Enhancement in Program Enrollment Tool
* updated the docs
2018-01-05 12:42:39 +05:30
rohitwaghchaure
bc2c83ee3c
Companywise default tax template ( #12290 )
...
* Companywise default tax template
* Fix test cases
2018-01-05 12:42:02 +05:30
rohitwaghchaure
3f784a7a49
[minor] POS profile mandatory, to set as default ( #12307 )
2018-01-05 12:26:33 +05:30
rohitwaghchaure
1f39feb12f
[Fix] PO -> PI non default taxes not fetched ( #12313 )
2018-01-05 12:25:45 +05:30
rohitwaghchaure
c5c6f82623
[Hotfix] Tax rate not showing in the report ( #12324 )
2018-01-05 12:16:16 +05:30
Nabin Hait
42688f0636
Minor fix
2018-01-04 18:12:21 +05:30
Nabin Hait
941d0af13a
Fixed organization lead error
2018-01-03 14:12:56 +05:30
Nabin Hait
76625b359e
Removed naming series from set_only_once in pos profile
2018-01-03 14:03:53 +05:30
Manas Solanki
76ea7a9227
Merge pull request #12301 from kennethsequeira/cust-report-vid
...
Updated youtube video link for custom reports article
2018-01-02 21:53:47 +05:30
Kenneth Sequeira
82bd3302ee
updated youtube video link for custom reports article
2018-01-02 21:41:48 +05:30
Saurabh
14506d7878
Merge branch 'master' into develop
2018-01-02 12:09:25 +05:30
Saurabh
abf5fa6bbb
bumped to version 10.0.5
2018-01-02 12:39:25 +06:00
tundebabzy
650a1eeede
recalculate terms when document date changed ( #12288 )
...
* recalculate terms when document date changed
* clean up
2018-01-02 12:02:30 +05:30
Nabin Hait
96b264b314
Minor fixes
2018-01-02 11:50:29 +05:30
Kenneth Sequeira
13e5689bd9
Updated the image paths for Custom Doctype manual
2018-01-01 17:33:57 +05:30
Saurabh
2ac1835f7d
[fix] if is_root is true make parent account empty ( #12255 )
2018-01-01 16:17:43 +05:30
Saurabh
15d53c7912
[fix] key error ( #12257 )
2018-01-01 16:17:14 +05:30
Saurabh
9579645ae1
[fix] if item code exists then only call get_item_details ( #12258 )
2018-01-01 16:17:02 +05:30
Saurabh
a6b41e855b
[fix] check if null for mode of payments ( #12264 )
2018-01-01 16:16:50 +05:30
rohitwaghchaure
526b0bc4e9
[minor] Code cleanup ( #12278 )
2018-01-01 16:16:16 +05:30
rohitwaghchaure
2640c7eec5
[Fix] Validation issue for online POS profile ( #12276 )
2018-01-01 16:15:41 +05:30
Nabin Hait
c33788a91b
Show standard rate only in unsaved Item
2017-12-29 15:42:50 +05:30
Jamsheer
c90195de29
Patient medical record and Consulatation ( #12198 )
...
* Patient Medical Record - Subject field reqd=0, Subject text formated
* Consultation - remove patient details section
* Search fields are updated for Consultation and Appointment
* Translations applied on menu
2017-12-29 14:32:13 +05:30
Javier Wong
2469095a13
Check Meta before Toggling Conversion Factor ( #12237 )
...
If it has been customized so as to set the conversion factor to read only, `toggle_conversion_factor` should respect that setting.
2017-12-29 14:06:47 +05:30
Shreya Shah
df0dd8be5f
Travis fix for client side tests ( #12224 )
...
* salary slip test fix
* attendance tool test fix
* timeout after routing
2017-12-29 14:04:46 +05:30
Nabin Hait
07be33805d
bumped to version 10.0.4
2017-12-28 19:16:51 +06:00
rohitwaghchaure
a84d38999c
[Fix] Sales order erased on production order on selection of sales order ( #12225 )
2017-12-28 18:45:27 +05:30
rohitwaghchaure
c9ed09440c
Re-execute uae vat patch ( #12230 )
2017-12-28 18:42:22 +05:30
rohitwaghchaure
fe22686a8f
Update last purchase rate from the purchase invoice ( #12189 )
2017-12-28 16:11:27 +05:30
Nabin Hait
c70a78dcf6
bumped to version 10.0.3
2017-12-28 14:52:57 +06:00
rohitwaghchaure
d45266881a
[Enhance] New print format for UAE/KSA for vat/excise ( #12202 )
...
* [Enhance] New print format for UAE/KSA for vat/excise
* Fixed spelling
2017-12-28 14:20:13 +05:30
rohitwaghchaure
dbb5ae9a9e
[fix] Closing balance showing at wrong side ( #12220 )
2017-12-28 13:15:21 +05:30
Nabin Hait
ca674bec42
Set numeric ranges in Item tamplate if blank ( #12199 )
2017-12-28 12:35:11 +05:30
Saurabh
28ce1c0c3a
[fix] add flag ignore mandatory ( #12201 )
2017-12-28 12:34:58 +05:30
Manas Solanki
91017cba8d
Additional fields in the instructor doctype for the academics log and minor permission changes ( #12204 )
2017-12-28 12:34:36 +05:30
Frappe PR Bot
878b5f7e71
[Translation] Updated Translations ( #12212 )
2017-12-28 12:31:01 +05:30
Manas Solanki
e20a0f1115
[Fix] make PE unique for the combination of academic year and academic term ( #12214 )
2017-12-28 12:29:11 +05:30
Fahim Ali Zain TP
5f7cedb206
Fix v8 to v10 migration issue ( #12177 )
2017-12-27 17:14:54 +05:30
Nabin Hait
a47ea94ab4
bumped to version 10.0.2
2017-12-26 19:05:49 +06:00
Nabin Hait
9e16697702
Merge branch 'master' into develop
2017-12-26 18:34:16 +05:30
Nabin Hait
451af06d2f
bumped to version 10.0.1
2017-12-26 19:04:16 +06:00
Nabin Hait
123759aff7
Fixes for travis ( #12161 )
...
* Fixes for travis
* Testcase fixes for get_item_details
* Testcase fixes for get_item_details
* Travis fixes
* Travis fixes
2017-12-26 17:50:34 +05:30
rohitwaghchaure
30e38ff7c7
[Fix] Asset make sales invoice ( #12168 )
2017-12-26 16:23:06 +05:30
Vishal Dhayagude
f06c281964
[fix] allow to change doc status on get items ( #12174 )
2017-12-26 16:22:40 +05:30
Manas Solanki
5e9d1246e8
remove the autoname from the supplier json
2017-12-26 15:21:03 +05:30
Nabin Hait
6211a3edf2
bumped to version 10.0.0
2017-12-25 15:54:48 +06:00
Nabin Hait
ed13b3c19a
Fixed minor issue
2017-12-25 15:11:56 +05:30
Nabin Hait
c65279b584
Reloaded account doctype in UAE Vat patch
2017-12-25 15:02:54 +05:30
Nabin Hait
92615901a7
Fixed merge conflict
2017-12-25 13:41:04 +05:30
Nabin Hait
f4c5cf5bd0
bumped to version 9.2.24
2017-12-25 14:08:05 +06:00
Nabin Hait
e9dabd5cec
Settings to show payment schedule in print ( #12158 )
2017-12-25 13:30:01 +05:30
Prateeksha Singh
293c700c08
Merge pull request #12157 from pratu16x7/setup-fixes
...
[setup] remove sample data commit, fix namespace
2017-12-25 12:31:23 +05:30
Prateeksha Singh
b61d091f4c
[setup] remove sample data commit, fix namespace
2017-12-25 12:30:35 +05:30
Nabin Hait
9da6844b52
Version 10 change log
2017-12-25 12:25:52 +05:30
rohitwaghchaure
79f8784772
Merge pull request #12156 from rohitwaghchaure/company_setup_issue
...
[Fix] Setup wizard UAE/KSA
2017-12-25 12:12:57 +05:30
Rohit Waghchaure
cfafb21842
[Fix] Setup wizard UAE/KSA
2017-12-25 12:12:07 +05:30
tundebabzy
590bd0a8e5
trigger payment_terms_template only when needed ( #12124 )
2017-12-25 11:40:19 +05:30
rohitwaghchaure
bd5e01b09b
[fix] Shipping address not fetch from purchase order in to purchase invoice & receipt. ( #12134 )
2017-12-25 11:28:07 +05:30
rohitwaghchaure
d8c6449f3a
[Fix] Bom raw materials not in order in the stock entry ( #12149 )
2017-12-25 11:26:40 +05:30
rohitwaghchaure
75789b65c2
[Fix] Sales payment summary report ( #12151 )
2017-12-25 11:26:15 +05:30
Zarrar
adc184c872
[Minor] Fix adding child to root task issue ( #12121 )
...
* make parent_task none
* adding multiple tasks - set project of parent
2017-12-22 11:00:19 +05:30
rohitwaghchaure
443691aaf8
[Fix] Allow to change exchange rate in the payment entry if allow stale is enabled ( #12128 )
2017-12-22 10:59:01 +05:30
Ameya Shenoy
3909bd4e9f
[agri] Disease task creation on new CropCycle fix ( #12131 )
2017-12-22 10:58:47 +05:30
Manas Solanki
5807cd8e6f
Set the guardian role automatically. ( #12136 )
...
* Add the guardian role for parent portal
* invite guardian as user
2017-12-22 10:50:10 +05:30
tunde
e3104938ff
fix typo
2017-12-21 16:25:44 +01:00
Manas Solanki
45cb791878
Merge pull request #12130 from manassolanki/leaderboard
...
remove the print statements
2017-12-21 13:04:25 +05:30
Manas Solanki
1f4b530e68
remove the print statements
2017-12-21 12:57:43 +05:30
Prateeksha Singh
8b0b56dda4
[Setup Wizard] Use setup stages ( #12000 )
...
* setup working with packages imports for operations
* setup stages
* use setup_stages hook
* remove commit from app setup
2017-12-21 11:55:58 +05:30
Umair Sayed
82035c6c7a
Update index.md ( #12118 )
2017-12-21 11:55:05 +05:30
Nabin Hait
e591c85f7c
Payment schedule total amount validation considering write off amount
2017-12-21 11:47:08 +05:30
Nabin Hait
a5cc84f8af
Reverted gl entry splitting based on payment terms ( #12117 )
...
* Reverted gl entry splitting based on payment terms
* changed modified date
2017-12-21 11:37:18 +05:30
rohitwaghchaure
174900506e
[HotFix] Validation issue for subcontract stock entry ( #12127 )
...
* [Fix] Validation issue for subcontract stock entry
* Update stock_entry.py
2017-12-21 11:28:01 +05:30
Nabin Hait
2f9f4f9c01
Multiple fixes related to payment terms ( #12115 )
2017-12-20 12:24:59 +05:30
rohitwaghchaure
84da00da2f
Allow to add items in manufacturing process which are not part of bom items ( #12110 )
2017-12-20 12:06:09 +05:30
Manas Solanki
8413f76c19
set the mandatory field in the backend ( #12102 )
2017-12-20 12:03:19 +05:30
Vishal Dhayagude
c8ecfa15f3
[new] Make Timesheet UX Added ( #12100 )
2017-12-20 12:02:34 +05:30
Ameya Shenoy
87b7844ae8
[Agri] Item amount set on item set ( #12091 )
...
* [Agri] Item amount set on item set
- closes #12008
- fixes #12010
* used frappe.call instead of frm.call in crop
* made modifications for sql query for BOM Item
- done since Crop doctype in Agri module also uses 'BOM Item' child table
* hide BOM no from BOM Item childtable in Crop
2017-12-20 12:00:24 +05:30
Prateeksha Singh
9a57049faa
Merge pull request #12113 from pratu16x7/leaderboard
...
Add Leaderboard to desktop
2017-12-20 11:39:05 +05:30
Prateeksha Singh
04c4ce353c
Add leaderboard to desktop
2017-12-20 10:51:25 +05:30
Saurabh
6386e9a1bd
[fix] set asset owner demo data
2017-12-19 14:52:07 +05:30
tundebabzy
dbd068c44b
Sales Order With Payment Terms Not Split In Payment Entry #12051 ( #12065 )
...
* validate schedule dates in non-invoice documents
* change query for orders
* take care of orders with/without payment schedule
* clean up, refactor, PEP8
2017-12-19 14:36:39 +05:30
Prateeksha Singh
41d2feab35
Merge pull request #12099 from pratu16x7/user-progress-items-fix
...
Create item price only if item created
2017-12-19 12:54:58 +05:30
Prateeksha Singh
3942cd353a
create item price only if item created, fixes #12041
2017-12-19 12:53:39 +05:30
tundebabzy
90076bc3b5
Make Journal entry from Invoice based on Payment Terms (due date) #11989 ( #12047 )
...
* split journal entry according to invoice due date
* fix bug where reference_due_dates options are not populated:
- after making JE, add options to _onload
- use __onload to add options
* cater for case where no payment_schedule
2017-12-19 11:58:31 +05:30
Ameya Shenoy
6e5b8bb5d3
fixed logic for creating disease tasks ( #12081 )
2017-12-19 11:41:10 +05:30
tundebabzy
5825dedf7c
Payment schedule error #12057 ( #12096 )
...
* use 12 places precision for sums
* use high float precision, fix decimal place late
* Update accounts_controller.py
2017-12-19 11:39:20 +05:30
Nabin Hait
f592f2c9a9
Revert "[Fix] Payment terms validation issue" ( #12098 )
...
* Revert "test fixed (#12094 )"
This reverts commit dd700a550f#12083 )"
This reverts commit 7c57b6ecd8#12090 )"
This reverts commit b725affe0c#12092 )"
This reverts commit 9b8e1cb10e
2017-12-19 11:31:34 +05:30
Shreya Shah
dd700a550f
test fixed ( #12094 )
2017-12-19 11:24:07 +05:30
Vishal Dhayagude
7c57b6ecd8
[fix] Column Heading in received item to be billed report ( #12083 )
2017-12-19 11:23:34 +05:30
rohitwaghchaure
b725affe0c
[fix] Mobile no search issue in the pos ( #12090 )
2017-12-19 11:21:00 +05:30
rohitwaghchaure
9b8e1cb10e
[Fix] Payment terms validation issue ( #12092 )
2017-12-19 11:20:29 +05:30
Nabin Hait
33c9da9ab1
Patch to update due_date in GLE, Journal Entry and Payment Entry ( #12093 )
2017-12-19 11:18:36 +05:30
Shreya Shah
ec1cb79e5f
Fetch employee advance in expense claim on adding it manually ( #12069 )
...
* added trigger on manually adding an advance
* improvised the query
* codacy fix
* updated
2017-12-18 18:06:01 +05:30
Zarrar
0acf687e20
Land unit tree ( #12072 )
...
* improvise tree structure
* remove set intro code
* remove all land units dependency
* test case corrected
2017-12-18 14:01:07 +05:30
Manas Solanki
2bca5a98ae
add the data import icon in the desktop.py ( #12062 )
2017-12-18 13:55:30 +05:30
rohitwaghchaure
e067beda49
[fix] Promise issue, in cart against item displaying zero values ( #12078 )
2017-12-18 12:32:49 +05:30
Shreya Shah
d903bd6a70
patch fix for asset ( #12079 )
2017-12-18 12:31:23 +05:30
Nabin Hait
4c816a1054
Patch to set calculate_depreciation if schedule already exists ( #12061 )
2017-12-16 11:17:36 +05:30
rohitwaghchaure
e3b5c0f727
[fix] Regional print format showing for other countries users ( #12045 )
2017-12-16 10:53:53 +05:30
rohitwaghchaure
938a1fee80
[minor] Tax id of supplier not fetching in purchase invoice ( #12052 )
2017-12-16 10:51:07 +05:30
Kenneth Sequeira
9bceb388c8
changed dead YouTube link for videos ( #12053 )
2017-12-16 10:50:29 +05:30
rohitwaghchaure
1bc47fa43c
[fix] Sales order tax not fetching on the sales invoice ( #12055 )
2017-12-16 10:49:58 +05:30
Ameya Shenoy
eb8446f01f
Agri fixes ( #12033 )
...
* crop_cycle, moving point in geojson from js to py
* crop fields are fetched into crop_cycle
- fixes #12011
* area is a readonly field
- fixes #11994
* [agri] land unit child geojson bug fixed
* set_intro null if parent field entered, list only group nodes
* minor fixes
2017-12-16 10:43:35 +05:30
Nabin Hait
2a9dc9019a
Fixed closing debit/credit in general ledger report
2017-12-15 19:41:20 +05:30
Prateeksha Singh
228c341d12
[setup-progress] Rerun letterhead slide patch
2017-12-15 18:32:27 +05:30
Nabin Hait
2afcff1852
Get outstanding invoices on payment entry
2017-12-15 17:32:03 +05:30
Nabin Hait
b9ca91a832
Update company.py
2017-12-15 17:23:11 +05:30
Faris Ansari
c7b92b73a6
fix patches for v7 sites ( #12043 )
2017-12-15 16:49:11 +05:30
Manas Solanki
53e47e6ba5
frappe call only if item code or serial no is ther ( #12036 )
2017-12-15 15:47:52 +05:30
Nabin Hait
13435dddcc
BOM: Fetch valuation rate of raw materials from Item master if not found based on SLE
2017-12-15 15:46:43 +05:30
rohitwaghchaure
78a17355be
[fix] Item search in POS ( #12037 )
2017-12-15 15:38:12 +05:30
Nabin Hait
6a640b78c4
Minor fixes in payroll entry and opening invoice tool
2017-12-15 15:34:14 +05:30
rohitwaghchaure
5a344576b8
[minor] Address fix ( #12025 )
2017-12-15 13:14:36 +05:30
Nabin Hait
9771b9376d
Merge branch 'master' into develop
2017-12-15 12:53:56 +05:30
Nabin Hait
2f22d2b307
bumped to version 9.2.23
2017-12-15 13:23:54 +06:00
rohitwaghchaure
ce8adecbad
Incoming rate fixes ( #11986 )
2017-12-15 12:13:50 +05:30
Jignesh Greycube
7f13283b66
Renamed Tax Breakup Label to In Words ( #12016 )
...
Detailed Invoice Print format, Renamed "Tax Breakup" Label to "In Words"
2017-12-15 11:59:30 +05:30
tundebabzy
1d459c4327
Make Journal entry from Invoice based on Payment Terms (due date) #11989 ( #12019 )
...
* don"t summarise due_dates query
* reference_due_date to fetch outstanding based on due date
* use if else so that no need to do useless checks
* clear debit and credit fields before fetching outstanding
* grid keeps forgetting drop down so add to options
* clear debit and credit fields before fetching outstanding properly
2017-12-15 11:29:27 +05:30
Vishal Dhayagude
d377018695
[fix] Shipping charges change on qty, item_code and conversion_factor trigger ( #12001 )
...
* [wip] shipping rule
* [wip] Shipping Rule tax auto calculate
* [wip] Shipping Rule
* [new] Shipping charges change on different triggers
* [minor] Removed unnecessary comments
* [fix] Minor Changes in function calls
2017-12-14 18:06:02 +05:30
Pawan Mehta
d6cb617520
Fix 11948 - Sales Payment Summary ( #11950 )
...
* [fix] #11948
* [fix] #11948
* [fix] #11948
* codacy issues
2017-12-14 18:04:31 +05:30
Nabin Hait
6b0d4bd01b
Minor fixes related to employee advance
2017-12-14 18:03:10 +05:30
Saurabh
65b3356dee
[fix] merge case in rename_translated_domains_in_en #11879 ( #12007 )
2017-12-14 16:52:50 +05:30
rohitwaghchaure
2b95a5438b
POS batch fixes ( #12005 )
2017-12-14 16:06:23 +05:30
Vishal Dhayagude
ee7b4f00f8
[minor] Chapter head link with Member ( #12003 )
2017-12-14 13:26:22 +05:30
Nabin Hait
d0249b0880
Employee advance ( #11875 )
...
* Employee Advances against Expense Claim
* added employee advance test cases and docs
* Default Employee Advance Account field in company
* Cleanup and fixes of employee advance
2017-12-14 13:25:57 +05:30
tundebabzy
02b4b5f526
Payroll Entry ( #11936 ) ( #11968 )
...
* add functions for tracking related salary slips
* PEP 8 style
* put buttons into Make based on context
* add function to test for bank entry journal
* refeactor `add_bank_entry_button`
* "View Salary Slips" made a standalone secondary button
* set_inner_btn_group for Make Bank Entry
* refresh button after journal is submitted
* edit javascript test case
* codacy
* fix as per review
* no longer use $c
2017-12-14 13:15:28 +05:30
rohitwaghchaure
24e5265281
[enhance] Search customer using primary contact mobile number ( #11998 )
...
* [enhance] Search customer using primary contact mobile number
* Update build.json
2017-12-14 13:06:21 +05:30
Shreya Shah
a2cfd97cd7
fetch party name ( #11985 )
2017-12-14 12:42:01 +05:30
Umair Sayed
4667cb2f62
Update implementation-strategy.md ( #12002 )
2017-12-14 12:21:47 +05:30
Zarrar
6e0acbe4d0
Patch to copy old field data to new field ( #11997 )
...
* patch to copy old fields data to new ones
* fix for patches related to project
* use rename_field function, copy if only field present
2017-12-14 12:21:00 +05:30
rohitwaghchaure
5759258dcf
[fix] Added total closing in general ledger ( #11961 )
2017-12-13 18:57:37 +05:30
rohitwaghchaure
40f5d8edd4
[fix] Pull subcontracted item if subassembly is not defined ( #11996 )
2017-12-13 18:51:05 +05:30
Ameya Shenoy
cc05c0b348
Agri fixes ( #11988 )
...
* minor fixes in agri
* updated desktop.py
* [agri] fixed recreation of dotypes in setup.py
* setup_wizard changes
- converted agriculture from alpha to beta
- rearranged the domains alphabetically
* [agri] linked doctype is collapsible
2017-12-13 18:50:39 +05:30
Shreya Shah
8cad3f12a2
Salary Slip not updating when adding/removing Timesheet links ( #11982 )
...
* timesheet on salary slip
* changes
* cal total wages
* calculate gross_pay and net_pay
* codacy fix
2017-12-13 18:43:01 +05:30
Nabin Hait
aaf378e340
Validate numeric attribute value based on range defined in template ( #11981 )
2017-12-13 18:40:52 +05:30
Zarrar
de8f6120f3
[Fix] Restrict domain specific roles ( #11975 )
...
* restrict roles to its specific domain
* missing hook for Non Profit
2017-12-13 18:36:08 +05:30
rohitwaghchaure
659b46832c
[fix] Patch ( #11976 )
2017-12-13 18:35:22 +05:30
Saurabh
aa66fa17d7
key fix in demo setup completion ( #11980 )
2017-12-13 18:34:43 +05:30
Manas Solanki
56f5b5f75c
Update the desktop.py ( #11974 )
...
Remove the data import desktop icons
2017-12-13 11:28:18 +05:30
Nabin Hait
0f97eda7c9
Merge branch 'master' into develop
2017-12-12 19:17:53 +05:30
Nabin Hait
66456dae34
bumped to version 9.2.22
2017-12-12 19:47:51 +06:00
Zarrar
21ea6cdb91
batch.expiry should be sorted in ascending order too ( #11960 )
2017-12-12 18:54:17 +05:30
Nabin Hait
af9bdfeaa3
Fixed calculation of taxes and totals if tax is entered as Actual, for Deduction or valuation ( #11965 )
2017-12-12 18:50:05 +05:30
Nabin Hait
aab1182c73
Update stock_entry.js
2017-12-12 18:45:39 +05:30
Pawan Mehta
bb7fab52d1
[fix] #11880- Item wise report showing price list and stock available ( #11885 )
...
* [fix] #11880
* review comments
* codacy fixes
2017-12-12 15:05:03 +05:30
KanchanChauhan
34ed1df9ef
[Minor] Update Status based on Asset Maintenance and Asse Repair ( #11886 )
2017-12-12 15:03:21 +05:30
Charles-Henri Decultot
d18423d9c7
Project Margin Calculation Improvement ( #11911 )
...
* Project Margin Calculation Improvement
* Documentation modification
* Change Total Planned Sales to Total Sales Amount
* Change documentation screenshot
2017-12-12 14:59:59 +05:30
Maxwell Morais
d06b7049c7
Allow manufacturing order from SO with Packed Items that contains BOM's ( #11947 )
2017-12-12 14:46:16 +05:30
rohitwaghchaure
4e17fae63b
[enhance] UAE/KSA VAT/Excise implementation ( #11923 )
2017-12-12 14:40:52 +05:30
Shreya Shah
ea723e59c6
POS Profile validation message rephrased ( #11934 )
...
* pos validation message improvised
* removed unused field
2017-12-12 14:24:00 +05:30
Shreya Shah
db499dcaa4
fixed fiscal dates ( #11939 )
2017-12-12 14:19:35 +05:30
tundebabzy
f628184c68
Error in Opening Invoice creation Tool ( #11938 ) ( #11941 )
...
* add qty field
* cast qty to float
* PEP8 compliance
2017-12-12 14:19:07 +05:30
tundebabzy
ff1b875661
Improve Validation Message in the Payroll Entry ( #11937 ) ( #11944 )
...
* change error message from `create_log`
* PEP 8 compliance
2017-12-12 14:18:14 +05:30
rohitwaghchaure
47749f4635
[fix] Cur_frm breaking offline pos ( #11955 )
2017-12-12 14:16:03 +05:30
Manas Solanki
6a415bd32d
set desktop icons ( #11953 )
2017-12-12 13:24:13 +05:30
Nabin Hait
de1e29bf1b
Production Order fixes ( #11951 )
...
* Production Order from Sales Order fixes: Validate SO and set required items on save
* Codacy fixes
2017-12-12 13:22:48 +05:30
Prateeksha Singh
1126a43979
[fix] hub connection, fixes #11357
2017-12-11 23:22:30 +05:30
pawan
1892454036
Add Total Row
2017-12-11 17:48:56 +05:30
KanchanChauhan
3ca00c7143
Items should not be used from Sample Retention warehouse ( #11905 )
2017-12-11 14:59:19 +05:30
rohitwaghchaure
d19be49889
[fix] Error opening the POS ( #11929 )
2017-12-11 14:57:43 +05:30
Shreya Shah
1b30642362
cal difference amount when qty 0 ( #11925 )
2017-12-11 14:56:57 +05:30
rohitwaghchaure
efbc0667ec
[fix] On change of payment terms template, not fetch respective schedule data ( #11928 )
2017-12-11 14:54:20 +05:30
rohitwaghchaure
505661b5c0
[fix] Wrong company's default tax fetch ( #11927 )
2017-12-11 14:52:28 +05:30
Giovanni
da40999ed8
- fix patch
2017-12-11 10:01:45 +01:00
Giovanni
dd37ceb707
patch to migrade barcodes into Item Barcode
2017-12-11 09:54:18 +01:00
Manas Solanki
3fe59b4443
remove the unnecessery files ( #11922 )
2017-12-11 13:01:27 +05:30
KanchanChauhan
236ac5eb38
[Fix] Customer and Address blank if does not exist in Delivery Stops ( #11895 )
2017-12-11 12:38:30 +05:30
KanchanChauhan
7f8df06663
[Minor]Removed alert=true from frappe.throw ( #11904 )
2017-12-11 12:24:43 +05:30
Prateeksha Singh
0419e2384d
reinitialize variant attribute table, fixes #11900 ( #11921 )
2017-12-11 12:22:28 +05:30
Giovanni
43372d3333
- make barcode mandatory if child row is added
...
- check valid barcode only if exists
2017-12-10 20:56:48 +01:00
Giovanni
ff7d73e418
- query fix
2017-12-10 20:46:46 +01:00
Giovanni
2a098ada7c
- bug fix
2017-12-10 20:33:20 +01:00
Giovanni
4c848ee14f
- codacy fix
2017-12-10 20:06:56 +01:00
Giovanni
8f8a485e07
- autoname field:barcode
2017-12-10 19:46:01 +01:00
Giovanni
ff6d0a5260
- clean code - console logs
2017-12-10 19:36:42 +01:00
Giovanni
01953135c5
- code clean
2017-12-10 18:54:19 +01:00
Giovanni
a04c756913
- validate EAN or UPC-A code
...
- made Item Barcode Doctpye standard
- added stdnum to requirements
2017-12-10 18:54:08 +01:00
Giovanni
9b7e52cafb
- added barcode validation against Item Barcode
2017-12-10 18:11:48 +01:00
Giovanni
2144e02d3c
- Added multiple barcode feature per item
2017-12-10 17:27:09 +01:00
Nabin Hait
d10014bdeb
minor fix in fetching payment terms template
2017-12-08 16:51:53 +05:30
Asharam Seervi
98d5878aa2
Added Column Break in Item Master ( #11887 )
...
* Fixed: On Item form, added cb.
* Fixed: On Item form, added cb.
2017-12-08 16:18:23 +05:30
Shreya Shah
6b64947f47
Route to Payment Entry instead of Journal Entry in paid Expense Claim ( #11874 )
...
* route fixed
* improvised
2017-12-08 16:14:23 +05:30
Zarrar
17fd6610dc
Fix travis ( #11882 )
...
* fieldname wrong
* bifurcated test into two - error when both were running async
* minor fixes with link and route
* move school domain rename up
* fix async creation of operations test
* edit-in-full-page is button, not link
* set_route issue in production order test
* minor changes
* fix task tree test
* more fixes
* fix server side issue
* improvising ui tests
2017-12-08 14:57:38 +05:30
Zarrar
2ba198ec70
improvise query ( #11878 )
2017-12-08 11:35:53 +05:30
Vishal Dhayagude
6d250f8789
[fix] Missing value Net Weight Added in Calculate Based On select field ( #11883 )
2017-12-08 11:35:18 +05:30
Shreya Shah
88dbc26a98
replace process payroll ( #11873 )
2017-12-07 18:24:42 +05:30
Zarrar
5ee5d43295
ontrash of nestedset wasn't ideal for employee's usecase ( #11876 )
2017-12-07 17:16:59 +05:30
Ameya Shenoy
396feba874
agri_docs fix links ( #11870 )
2017-12-07 12:53:57 +05:30
Nabin Hait
4cad7fc36c
Fixed Merge conflict
2017-12-07 12:04:19 +05:30
Nabin Hait
6674ba8bd1
bumped to version 9.2.21
2017-12-07 12:33:40 +06:00
Nabin Hait
5de499e5d5
Minor cleanups
2017-12-07 12:01:06 +05:30
pawan
271b7cd4f9
codacy issues
2017-12-07 12:01:00 +05:30
pawan
19f09b0b69
fix codacy issues
2017-12-07 12:00:06 +05:30
pawan
d8e91982ca
Fixed Merge conflict
2017-12-07 12:00:01 +05:30
Ameya Shenoy
e0d461c2eb
[Agriculture] documentaion ( #11867 )
2017-12-07 11:53:12 +05:30
Doridel Cahanap
9f7e109c3e
[minor] Fix Delivery Trip Error ( #11868 )
2017-12-07 11:52:33 +05:30
Nabin Hait
97b8a7b237
Minor fixes in payroll entry
2017-12-06 19:55:57 +05:30
Nabin Hait
bb09437d1f
Merge branch 'develop' into payroll_entry
2017-12-06 19:18:40 +05:30
Shreya Shah
b13a54ac74
Checkbox in Price list for Price not UOM dependant ( #11836 )
...
* checkbox price not uom dependant
* change price list rate on uom dependancy condition
* test case
* Update get_item_details.py
2017-12-06 19:17:03 +05:30
KanchanChauhan
f6aff3de96
[New Feature] Sample Retention from a Batch of item recieved ( #11624 )
2017-12-06 18:38:01 +05:30
Ameya Shenoy
5c62368a65
[Agriculture Domain] ( #11663 )
...
* created Soil Analysis, Water Analysis, Weather and Fertilizer doctype
* soil doctype edited and crop doctype added
* minor stuff
* Land Unit + Leaflet
* crop cycle added
* Land Unit changes + Crop cycle
* autoname for plant_analysis
* created Agriculture Task
* minor stuff
* - deleted agriculture_task
- current state after the call
* [Agriculture] modified fertilizer doctype to have a link to Item
This was done so that the `Fertilizer` doctype could track the contents exclusive to the fertilizer, whereas the `Fertilizer Item` could be a seperate entity, so as to leverage the existing ERPNext doctypes
* Added fields to `Water Analysis` doctype
- Collection Datetime
- Laboratory Testing Datetime
- Results Datetime (default to Laboratory Testing Datetime)
* Edited the doctypes `Agrivulture Task`, `Pest` and `Soil Texture`
- Created `agriculture task` doctype
- added fields `Common Name`, `Scientific Name`, `Treatment` and `Treatment Options` to `Pest` doctype
- edited `Soil Texture` doctype to contain a soil texture ternary plot diagram made using SnapSVG. The code was put in public folder so as to be accessible by the entire agriculture module
* Recursively reflect child land unit feature changes on parents
* fixed feature repition bug
* added legeneds to ternary plot
* added stuff
* changes
* fix Task
* reverted the Task Doctype to have naming in the form TASK.#####
* fixed modifications made to TASK doctype
* [dirty commit] added auto create Task from Crop on creation of Crop Cycle
* Changed the Crop Cycle Doctype
- Deleted the "Crop Cycly Task" doctype and its link from "Crop Cycle"
- Creation of a new Project with the same name as the Crop Cycle on creation of a new Crop Cycle
- Creation of all the tasks imported from Agriculture Task doctype of the Crop in the Crop Cycle
* [Agriculture Module] Modifications
- Created childtable doctype "Pest Detected"
- Added childtable "Pest Detected" to Pest
- Modified "Agriculture Task" to include "Start Day" and "End Day" of task
- Modified the code in "Crop Cycle" to create a parent task with same name as Crop Cycle
* [Agriculture Module] fixed Pest doctype not saving issue
* [Agrcilture Module] Changes in Crop Cycle
- removed the creation of a master task on creation of a new crop cycle
- temporary fix to add the pest tasks from the pests added in crop cycle
* land_unit_tree.js fields modified to have field objects instead of just field names
* Revert "land_unit_tree.js modified"
* land_unit_tree.js fields modified to have field objects instead of just field names
* [Agriculture Domain] Converted Agriculture Module to a Domain
- Converted into a Domain field from Select to Link field in Company doctype, linked to Domain doctype
- Agriculture (alpha) is now a Domain
* land_unit area aggregation enabled
* land_unit.py checks feature diff for every ancestor and not just the parent
* Removed unnecessary print messages
* agriculture.py modified to include fixtures
* fixtures added to setup.py inside agriculture module
* [Agriculture Domain] UI tests added
- 'materials' table renamed to 'materials_required' in 'Crop'
- wrote UI test for Crop, Fertilizer, Crop Cycle, Pest, Water Analysis, Soil Texture
- moved creation of tasks from client side to server side in Crop Cycle
- Plant Analysis, Water Analysis, Soil Analysis, Soil Texture docs are now autonamed in the format PAnalysis.#####, WAnalysis.#####, SAnalysis.#####, STexture.##### respectively
- company_name changed in domains.py from 'Schrute Farms.' to 'Schrute Farms'
* [Agriculture Domain] Mostly written server side tests and moved client side code to server side
- moved client side code to server side for Crop, Water Analysis, Pest, Soil Texture,
- wrote server side tests for Crop, Crop Cycle, Fertilizer, Soil Texture, Pest
- NOTE: none of the server side codes were tested
* [Agriculture Domain] All server side tests working locally
* [Agriculture Domain] Testing
- added sample test for Land Unit, which needs to be modified to test multiple things
- modified tests to be independant of each other
* Land Units tests added and area aggregation code migrated to server side
* added land_unit server side tests and on_trash added to land_unit
* Changing field location for start date
* [Agriculture Domain] deleted unnecessary comments
* [Agriculture Domain] reverted changes
* [Agriculture Domain] Modified the code to replace Pest doctype with Land Unit doctype
- Deleted the Pest doctype and replaced it with the more generic Disease doctype
- Deleted the Detected Pest doctype and replaced it with Detected Disease doctype
* [Agriculture Domain] resolves #11654 , resolves #11653
* [Agriculture] Added links to soil analysis, soil texture, plant analysis in crop cycle and land unit
- not working perfectly yet
- docs are fetched but not appended
* [Agricuture] Crop Cycle modifed to link with relevent analysis docs, not fully functional
* [Agriculture] added seperate stage for client side agriculture tests
* [Agriculture] minor modification to crop_cycle.js test
* [Agriculture] fixed tests
* upgrade chromedriver in .travis.yml from 2.32 to 2.33
* [Agriculture] added land unit ui test
* [Agriculture] added Agriculture server side test as a seperate stage in travis
* tesing travis.yml
* [Agriculture] Crop Cycle is able to fetch linked analysis docs
* Modified travis.yml for modular server side testing
* [minor fix][Agriculture] in soil_texture
- fixed multiple soil_texture ternary plot creation on refresh
- fixed error on soil composition change
* Update .travis.yml
* removed location field from linked doctypes
* minor fixes and cleanup of agri
* minor fix in agriculture and domain patches
* permissions added to agriculture
- Agriculture Manager and Agriculture User roles were added to all Agriculture doctypes
* [Agriculture]
- Created Agiculture Analysis Criteria and added sample records to it
- All the analysis doctypes now fetch their fields inside a child table, form Agriculture Analysis Criteria
- Also Fertilizer does the same
This was introduced so that, new parameters could be added on demand
* minor changes requested in Agriculture
* minor changes
* minor fix
* Update desktop.py
* Update .travis.yml
2017-12-06 18:36:27 +05:30
Vishal Dhayagude
b930dfa74c
[fix] fix patch failed erpnext/patches/v7_2/make_all_assessment_group.py ( #11864 )
2017-12-06 18:03:21 +05:30
Vishal Dhayagude
d4e439906c
[fix] Modification in Non Profit docs ( #11862 )
2017-12-06 18:02:31 +05:30
Zlash65
5fc8923322
fix setup-wizard leftovers
2017-12-06 17:04:03 +05:30
Nabin Hait
c84476bd27
Fixed merge conflict
2017-12-06 14:17:51 +05:30
Nabin Hait
7de5d3bb1d
bumped to version 9.2.20
2017-12-06 14:47:13 +06:00
Manas Solanki
a160879159
set the reference document in the payment entry while creating from fees ( #11861 )
...
* set the reference document in the payment entry while creating from fees
* allocate the paid amount in the reference document
2017-12-06 14:05:39 +05:30
Prateeksha Singh
7351709980
[multicheck] Select multiple domains in setup ( #11709 )
...
* [multicheck] select multiple domains in setup
* use multiple domains in make_sample_data
* revert to setting in domains child table
* domains slide validation
* update setup wizard test
2017-12-06 13:28:06 +05:30
rohitwaghchaure
1b16bca843
[minor] Escape special characters ( #11855 )
2017-12-06 13:16:06 +05:30
tundebabzy
6a418f2a9b
change Purchase Taxes and Charges default to 'Total' ( #11857 )
2017-12-06 13:15:33 +05:30
rohitwaghchaure
d52c64ff11
[fix] Show total for opening and closing dr/cr ( #11860 )
2017-12-06 13:14:28 +05:30
Nabin Hait
51ce1027de
non-profit module cleanups
2017-12-06 12:58:04 +05:30
Nabin Hait
419db49806
non-profit module cleanups
2017-12-06 12:57:53 +05:30
Vishal
54f5b115a7
[new] Role added
2017-12-05 17:51:15 +05:30
Vishal
474d58cecf
[fix] minor changes
2017-12-05 17:19:02 +05:30
Vishal
5ffbd4f492
[fix] Reviewed Modification in Grant Application
2017-12-05 16:41:09 +05:30
Vishal
91236fa9d6
[fix] Reviewed modification on donor and volunteer
2017-12-05 16:41:09 +05:30
Vishal
139545a0f7
[fix] Minor changes in membership
2017-12-05 16:41:09 +05:30
Vishal
74116172b8
[fix] Reviewed Chapter Doctype Modification
2017-12-05 16:41:09 +05:30
Vishal
debc93c58a
[new] Non Profit Domain patch added
2017-12-05 16:41:09 +05:30
Vishal
5ade836713
[new] Non Profit Documentation Modified
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
55480491bf
[minor] changes added in member and membership doctype
2017-12-05 16:41:09 +05:30
Vishal
5a4611df95
[fix] fetch expiary date from membership to member doctype
2017-12-05 16:41:09 +05:30
Vishal
0dbf00a283
[fix] Minor changes in grant application
2017-12-05 16:41:09 +05:30
Vishal
344f5d9cd6
[fix] Minor changes in grant_application.html
2017-12-05 16:41:09 +05:30
Vishal
155ec4ba58
[new] Grant application doctype clean up after review
2017-12-05 16:41:09 +05:30
Vishal
74fb550a70
[new] sidebar added on chapter web page
2017-12-05 16:41:09 +05:30
Vishal
a72a3bd536
[new] Chapter Module clean up after review
2017-12-05 16:41:09 +05:30
Vishal
fe0c6c8e28
[fix] Non Profit Domain clean up after review
2017-12-05 16:41:09 +05:30
Vishal
a68234d345
[new] Fontawesome icon added
2017-12-05 16:41:09 +05:30
Vishal
fca5cfe986
[fixed] Codacy fixed
2017-12-05 16:41:09 +05:30
Vishal
397a8761f7
[new] Convert Non Profit Module into Non Profit Domain
2017-12-05 16:41:09 +05:30
Vishal
43977a1422
[fix] Minor Changes in grant_application.py
2017-12-05 16:41:09 +05:30
Vishal
fa8f762805
[fix] Grant Application Url added in message body on sendmail
2017-12-05 16:41:09 +05:30
Vishal
da05b3ce7f
[fix] Modified Grant Application Test
2017-12-05 16:41:09 +05:30
Vishal
b4a8e11edc
[new] Account table added in Grant Application
2017-12-05 16:41:09 +05:30
Vishal
1a88562ef9
[new] Assessment Manager for grant Review, web portal added
2017-12-05 16:41:09 +05:30
Vishal
7c7c3522cb
[new] Codacy fixed
2017-12-05 16:41:09 +05:30
Vishal
a6a302f8a6
[new] Grant Application Web Form Added
2017-12-05 16:41:09 +05:30
Vishal
6a4fd7d89e
[fix] UI Test
2017-12-05 16:41:09 +05:30
Vishal
788f41707e
Chapter Message Link field added
2017-12-05 16:41:09 +05:30
Vishal
5cd70bed25
[new] Test Cases Added for Non Profit
2017-12-05 16:41:09 +05:30
Vishal
86140c8659
[fix] Codacy Issue
2017-12-05 16:41:09 +05:30
Vishal
f86984c785
[fix]travis build issue
2017-12-05 16:41:09 +05:30
Vishal
d051921ff8
[fix] Codacy issue
2017-12-05 16:41:09 +05:30
Vishal
722c06e819
[fix] travis
2017-12-05 16:41:09 +05:30
Vishal
1ebdeacee3
UI Test Added for Membership Type
2017-12-05 16:41:09 +05:30
Vishal
1c5bf8e3ca
modified index.md
2017-12-05 16:41:09 +05:30
Vishal
d5d0813b2d
[new] Modified Doctypes for list view
2017-12-05 16:41:09 +05:30
Vishal
2c9ce190eb
[new] Grant Application Doctype Added
2017-12-05 16:41:09 +05:30
Vishal
18ac423c47
[new] Volunteer skills and Availability Added
2017-12-05 16:41:09 +05:30
Vishal
7525bc6f1d
[new] Doctype Donor and Volunteer Added
2017-12-05 16:41:09 +05:30
Vishal
b4d73cbda0
[fix] Imported getdate in erpnext
2017-12-05 16:41:09 +05:30
Vishal
546130c046
Documentation added for Non Profit
2017-12-05 16:41:09 +05:30
Vishal
b4cda1b4a1
[fix] Address field removed in Member
2017-12-05 16:41:09 +05:30
Vishal
10608e8c65
[fix] Removed address field in Member doctype
2017-12-05 16:41:09 +05:30
Vishal
e01846051d
Membership Type shows under memberhip section
2017-12-05 16:41:09 +05:30
Vishal
3a75a5e9b5
New Party Type Member Added
2017-12-05 16:41:09 +05:30
Vishal
5dae126f56
Membership Doctype Added
2017-12-05 16:41:09 +05:30
Vishal
cc06d291c6
link member in dynamic link table
2017-12-05 16:41:09 +05:30
Vishal
50f13e17a7
[new] Chapter Doctype Added
2017-12-05 16:41:09 +05:30
Vishal
ca61453fa3
[new] Non Profit module Added
2017-12-05 16:41:09 +05:30
rohitwaghchaure
3a5ca927e7
[Fix] Asset depreciations and balances report showing wrong accumulated depreciation amount if multiple asset against same asset category ( #11848 )
...
* [Fix] Asset depreciations and balances report showing wrong accumulated depreciation amount if multiple asset against same asset category
* Update asset_depreciations_and_balances.py
2017-12-04 19:29:03 +05:30
Zarrar
c47745ea83
only fetch distinct names of events ( #11846 )
2017-12-04 19:23:20 +05:30
Kenneth Sequeira
406cb920ae
Documentation Update ( #11844 )
...
* Delete payment-tool.md
* Update index.txt
Removed Payment Tools from Index
* Update index.txt
removed barcode setup from index
* Delete barcode-1.png
removed barcode-1.png
* Delete barcode-2.png
* Delete bar-code.md
removing barcode set up as functionality is deprecated. Barcode can be directly entered in Item Master.
* Delete bar-code.md
removing barcode set up as functionality is deprecated. Barcode can be directly entered in Item Master.
* Update index.txt
remove bar-code set up link from index de (german)
* Update index.txt
remove bar-code set up link from index de (german)
2017-12-04 19:22:50 +05:30
Manas Solanki
e6fd07fda9
Changes in the Fee structure ( #11842 )
...
* academic year non mandatory in the fee structure and minor changes
* update the docs
2017-12-04 19:21:50 +05:30
Shreya
e570e4a049
fixed a test
2017-12-04 16:49:44 +05:30
Shreya
f8e7bc7c5b
removed process payroll doctype
2017-12-04 16:49:44 +05:30
Shreya Shah
db332f2c08
employee_details table added
2017-12-04 16:49:44 +05:30
Shreya
9956f15c80
added py test
2017-12-04 16:49:44 +05:30
Shreya
b5dff03453
added changes from process payroll
2017-12-04 16:49:44 +05:30
Shreya
d1defa5fc7
set salary components
2017-12-04 16:49:44 +05:30
Shreya
d73dd056d6
test case
2017-12-04 16:49:44 +05:30
Shreya
7b2870431e
new doctype payroll_entry
2017-12-04 16:49:44 +05:30
Shreya
eba3f39bbe
test delivery trip fix
2017-12-04 16:04:56 +05:30
Shreya
3febe0215e
test asset fix
2017-12-04 16:04:42 +05:30
Shreya Shah
8ee1ea456d
travis fix ( #11841 )
2017-12-04 14:28:02 +05:30
Nabin Hait
a11dcb6e59
Pull items in Stock Entry from Purchase Invoice ( #11839 )
2017-12-04 13:36:50 +05:30
rohitwaghchaure
148fccd45a
[Fix] Wrong value showing in the email digest ( #11840 )
2017-12-04 13:36:01 +05:30
Manas Solanki
3bac586ee2
fix in the assessment result tool while entering the zero marks ( #11837 )
2017-12-04 12:55:10 +05:30
tundebabzy
3061fc92fd
Batch Stock Items, having serial number can't be moved without inserting Serial Number ( #11792 ) ( #11813 )
...
* if doctype is batch, add extra information to args
* automatically fetch serial numbers if possible
* take advantage of changes in make_stock_entry
* code clean up
* PEP 8 compliance
* fix bug that clears serial number
2017-12-04 11:23:21 +05:30
Zarrar
5e470f757f
[Fix] Filter on child table not working in Calendar ( #11824 )
...
* use the new get_events method
* using the common get_events method for calendar_view
* using add_fetch to fill customer_name
2017-12-04 11:22:25 +05:30
Charles-Henri Decultot
8a052cb153
Translation issue ( #11833 )
2017-12-04 11:17:05 +05:30
vwithv1602
78d5ccf5fc
Invalid return against purchase invoice Error - Issue#11834 ( #11835 )
2017-12-04 11:16:34 +05:30
tundebabzy
1fb285c165
hide html example in print ( #11830 )
2017-12-04 11:13:36 +05:30
Shreya Shah
11938a47ec
fixed typo ( #11825 )
2017-12-01 17:38:26 +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
Saurabh
a067ddbc20
bumped to version 9.2.19
2017-12-01 16:52:43 +06:00
Charles-Henri Decultot
e90a1caeb1
Portal print format correction ( #11812 )
...
* Portal print format correction
* Correction following Rushabh's comment
2017-12-01 16:19:45 +05:30
Kenneth Sequeira
9e27b347ca
Delete payment-tool.md ( #11820 )
...
* Delete payment-tool.md
* Update index.txt
Removed Payment Tools from Index
2017-12-01 16:17:53 +05:30
KanchanChauhan
8380253178
On changing assign_to assign maintenance task in Asset Maintenance ( #11804 )
2017-12-01 16:14:05 +05:30
Jamsheer
f4d9af1ab9
Fix Patch - remove company from patient ( #11819 )
2017-12-01 16:10:39 +05:30
rohitwaghchaure
b1ac979ac5
[fix] Do not allow zero valuation rate for serial no and fetch previous valuation rate for serial no ( #11817 )
2017-12-01 16:09:02 +05:30
pawan
14d570ed9e
fix
2017-11-30 18:41:09 +05:30
pawan
2ff844e740
default warehouse / remove validation / change sql
2017-11-30 18:14:55 +05:30
Nabin Hait
7a294e6ef5
Update asset_category.json
2017-11-30 18:02:22 +05:30
Nabin Hait
5e801955f1
Update asset_category.json
2017-11-30 18:01:56 +05:30
Saurabh
34a0e90115
[fix] merge conflicts
2017-11-30 16:45:01 +05:30
Saurabh
f9509a084a
bumped to version 9.2.18
2017-11-30 17:11:46 +06:00
Nabin Hait
1b89be0c66
Fixed rounding issue in subcontracting ( #11802 )
2017-11-30 15:59:56 +05:30
rohitwaghchaure
e34ef60e3e
[fix] Asset test cases and added make_sales_invoice ( #11800 )
...
* [fix] Asset test cases and added make_sales_invoice
* vehicle trip test cases
2017-11-30 15:59:40 +05:30
Faris Ansari
ec3be9eebf
[hotfix] Party Type name ( #11797 )
2017-11-30 15:53:39 +05:30
Nabin Hait
c5e0d22464
Update set_delivery_date_in_so_item.py
2017-11-30 15:52:47 +05:30
pawan
e4aaff6686
message changes
2017-11-30 15:49:54 +05:30
pawan
f5bb2af92c
test case
2017-11-30 15:20:00 +05:30
Nabin Hait
e761b9de40
Rearranged fields due to merge conflict messup
2017-11-30 14:29:10 +05:30
Vishal Dhayagude
8677cd1565
[patch] Patch added to rename net_weight field ( #11798 )
2017-11-30 13:52:30 +05:30
pawan
e43cd915e8
alignment
2017-11-30 12:31:32 +05:30
pawan
abc5523405
code improvements
2017-11-30 12:23:46 +05:30
Manas Solanki
f9cc56cd62
minor fixes in the assessment result tool ( #11795 )
2017-11-30 11:39:06 +05:30
tundebabzy
ce63ab7602
Show Batch Selector Dialog Only If There Are Multiple Batches ( #11794 )
...
* check if multiple batches available before showing dialog
* Update point_of_sale.js
2017-11-30 11:38:53 +05:30
tundebabzy
8ae53cacc5
When Warehouse Field Is Changed, Batch Number Field Should Be Updated ( #11789 ) ( #11790 )
...
* reset batch_no field if no batch number returned
* on warehouse change, query for batch number
2017-11-30 11:37:21 +05:30
pawan
11398fd572
Validation for reserved warhouse
2017-11-29 21:16:02 +05:30
Shreya
c0c470b56d
fixed json affected by latest merge
2017-11-29 19:31:15 +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
Rohit Waghchaure
17e03cf3fc
[minor] Removed hidden for field pos profile
2017-11-29 17:40:42 +05:30
Rushabh Mehta
0154538c06
[fix] [minor] pos.js
2017-11-29 16:42:02 +05:30
Vishal Dhayagude
855e390265
[fix] Sales Invoice json conflict ( #11779 )
2017-11-29 16:25:24 +05:30
rohitwaghchaure
1b344ca81e
[Fix] POS not loading if pos profile not defined ( #11778 )
2017-11-29 16:21:51 +05:30
Vishal Dhayagude
d42242df22
[Feature] Shipping Rule Calculation based on Net Weight ( #11770 )
...
* [new] Calculate shipping tax based on weight
* [fix] Change field name weight to weight_per_unit in SI Item
* [new] Shipping Rule based tax for selling module
* [new] Shipping rule based on weight added to Buying module
* [fix] Conflict in jsons
* [fix] Removed Redudant add_fetch
* [fix] Codacy fixed
* [fix] Print hide added
2017-11-29 16:09:59 +05:30
KanchanChauhan
2d1cbd0b2e
Delete old asset doctypes from Accounts module and minor changes ( #11766 )
2017-11-29 16:03:00 +05:30
Nabin Hait
ad2a3e4f38
Cleanup and fixes on delivery trip
2017-11-29 15:53:01 +05:30
Nabin Hait
46e285efe9
Merge branch 'add_delivery' of https://github.com/creamdory/erpnext into creamdory-add_delivery
2017-11-29 14:15:16 +05:30
rohitwaghchaure
f591a220c9
Fetch items of item groups defined in the pos profile ( #11763 )
2017-11-29 13:55:13 +05:30
Zarrar
c43c5cae5a
Set query sales order ( #11772 )
...
* set_query for sales order based on production_item
* codacy fix
* check in packed item to fetch sales order
* Update production_order.py
2017-11-29 13:54:35 +05:30
rohitwaghchaure
2fb8cc5f2c
[fix] Options must be a valid DocType for field Asset Category in row 18 ( #11773 )
...
* [fix] Options must be a valid DocType for field Asset Category in row 18
* test cases
2017-11-29 13:50:04 +05:30
tundebabzy
2a4fefc6ff
Auto fetch batches based on quantity on POS ( #11004 ) ( #11767 )
...
* prevent premature escape when item has serial no and batch no
* fetch actual_batch_qty for item
* add available_qty to dialog
* remove expired batches from drop-down
* Update queries.py
2017-11-29 10:53:09 +05:30
Julian Robbins
d785e22211
Fix spelling of accessibility ( #11765 )
2017-11-29 10:49:12 +05:30
pawan
54465f5df1
review comments changes
2017-11-29 10:18:38 +05:30
tunde
0d82b6979e
add missing field and value parameters
2017-11-28 23:30:03 +01:00
tundebabzy
bc7c387a0d
set read only property properly ( #11761 )
2017-11-28 22:40:05 +05:30
Prateeksha Singh
bf31d853e7
Merge pull request #11762 from manassolanki/fix
...
fix for module in the new report
2017-11-28 19:08:52 +05:30
Manas Solanki
34a8be83ea
delete the old files
2017-11-28 18:47:56 +05:30
Manas Solanki
49ff065684
fix for the new report module
2017-11-28 18:44:06 +05:30
Manas Solanki
84e9d45055
Minor fixes for the Education domain ( #11758 )
...
* add the new role Education Manager for education settings
* minor changes in the hooks for bootinfo
* Fix for amending the assessment plan
2017-11-28 18:04:08 +05:30
Nabin Hait
cf9573ab2f
Removed asset doctypes files from accounts module and patches
2017-11-28 16:56:53 +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
Kanchan Chauhan
e58a41a8a2
Added maintenance to Asset and enhanced maintenance for Asset Maintenance
2017-11-28 15:14:56 +05:30
Nabin Hait
35cd1d325f
[fix] Set GST State code based on state, even if GSTIN not mentioned ( #11755 )
2017-11-28 13:01:01 +05:30
Doridel Cahanap
de82fe9e8f
[minor] Set Rename for Training Program ( #11740 )
2017-11-28 11:26:23 +05:30
Saurabh
b750b304dd
fixed merge-conflicts
2017-11-28 11:02:28 +05:30
Saurabh
d86ace41a1
bumped to version 9.2.17
2017-11-28 11:30:17 +06:00
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
Saurabh
8eda0cc8ba
[fix] validate bom if order type is subcontracting ( #11705 )
...
* [fix] validate bom if order type is subcontracting
* [fix] moved validation to server side
2017-11-28 10:41:35 +05:30
rohitwaghchaure
a14baf4188
Merge pull request #11739 from rohitwaghchaure/payment_terms_test_case
...
[fix] payment terms test case
2017-11-27 12:05:57 +05:30
Saurabh
9d0092f89a
[fix] pull source warehouse from production order child table ( #11718 )
2017-11-27 12:04:41 +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
Charles-Henri Decultot
22641e44ad
Allowing the creation of an Oganization as Lead ( #11724 )
...
* Allow the creation of an organization lead
* Changes following test fails
* Test case correction
2017-11-27 11:58:22 +05:30
Shreya Shah
dcbc4284d3
expenses included in valuation account type in purchase taxes and charges ( #11725 )
2017-11-27 11:48:09 +05:30
Rohit Waghchaure
52bf56d415
[fix] payment terms test case
2017-11-27 11:43:52 +05:30
rohitwaghchaure
373b5702a9
[fix] Server test cases ( #11727 )
2017-11-27 11:27:28 +05:30
Saurabh
ab5e77ecf1
[fix] do not pull disabled pos profiles ( #11733 )
2017-11-27 11:26:13 +05:30
pawan
f5279a0d67
[fix] #8427
2017-11-24 11:21:47 +05:30
rohitwaghchaure
15f8fe0179
[fix] Batch selected in the sales transaction for non batch item ( #11713 )
2017-11-24 10:46:27 +05:30
Saurabh
41f60546a1
[fix] do not allow user to create party type ( #11706 )
2017-11-23 18:02:51 +05:30
Nabin Hait
82ef26b327
Minor fix in patch
2017-11-23 17:57:33 +05:30
Nabin Hait
aa5b566ea9
Merge branch 'ashish-greycube-feature_10861-1' into develop
2017-11-23 17:49:25 +05:30
Nabin Hait
68768252ce
Cleanup and fixes on bypass credit limit check on sales order
2017-11-23 17:48:59 +05:30
Rohit Waghchaure
09b39f06ea
Code cleanup
2017-11-23 16:30:10 +05:30
Nabin Hait
57952f6946
Merge branch 'develop' into feature_10861
2017-11-23 16:12:55 +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
tundebabzy
acccdb3890
Default batch number selection ( #11454 )
...
* fetch batch_no in `get_basic_details`
* PEP8 changes and docstring
* only auto-fetch batch number for Sales documents:
otherwise, automatic batch creation will not work properly because all new
stock will be added to old batch
* new function to fetch batch number using FEFO:
FEFO - First Expiring First Out
* fetch batch number in `get_basic_details` using FEFO
* add new function - `set_batch_number`
* `set_batch_number` when `qty` is triggered
* `set_batch_number` when `uom` is triggered
* whitelist `get_batch_no_fefo`
* code clean up
* move `set_batch_number` to conversion_factor instead of uom
* rename `get_batch_no_fefo` to `get_batch_no`
* fix test case
* final cleanup
* Revert "fetch batch_no in `get_basic_details`"
This reverts commit dd024b1eb369eaeafab28165d523fb7a9f8ab8d3.
* fix test case
* update Sales Invoice manual
* move changes away from `transaction.js`
* query should not fetch expired batches
* refactor `get_batch_no`:
add new function `get_batches`
* Update batch.py
2017-11-23 13:05:15 +05:30
Nabin Hait
82027ea3bf
Set print hide property for payment terms
2017-11-23 12:49:42 +05:30
Manas Solanki
30babee2ef
add courses in the program enrollment ( #11694 )
2017-11-23 12:19:57 +05:30
Zarrar
a90274fed9
linking issue in dashboard ( #11701 )
2017-11-23 12:19:40 +05:30
Jamsheer
1ce56316ea
Populate patient_name in Healthcare Doctypes ( #11690 )
...
* On Cancel Consultation - Open Appointment - Delete Medical Record
* Add Filter on Account Selection - is_group: 0
* Patient Medical Record - List view Fixes
* Update consultation.py
* Set Appointment Refrence in Vital Signs
* Add Other in Gender Selection
* Populate patient_name in Healthcare Doctypes
2017-11-23 12:18:43 +05:30
Helkyd
6e3f789f82
code fixe
...
fixed })
2017-11-22 16:12:27 +01:00
Helkyd
3264c13545
No ZERO payment
...
If no payment mode selected does not process ... to avoid having SI with payment pending as POS for sure was paid..
2017-11-22 16:06:22 +01:00
Helkyd
0195528798
Merge branch 'develop' of https://github.com/Helkyd/erpnext-1 into develop
2017-11-22 14:51:18 +01:00
Helkyd
2b6bf82d61
Default Payment Mode
...
POS drafted, user retrieves the record and sets the default payment mode so that Zero payment is not done.
2017-11-22 14:49:51 +01:00
Saurabh
ed4191ec5b
[fix] merge-conflicts
2017-11-22 18:01:56 +05:30
Saurabh
4bc12b68e4
bumped to version 9.2.16
2017-11-22 18:24:18 +06:00
Nabin Hait
02ac901345
[fix] Rounding adjustment in company currency
2017-11-22 16:12:20 +05:30
rohitwaghchaure
4dc5f0efaf
[Fix] Item details not fetching if item has no default bom ( #11688 )
2017-11-22 15:21:47 +05:30
Nabin Hait
96abfd2ab9
[fix] In payment entry, run some events serially to avoid async issue
2017-11-22 15:13:16 +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
Zarrar
657ceef105
skipped tax_account ( #11678 )
2017-11-21 17:40:22 +05:30
Faris Ansari
6ca6a69070
Course Scheduling Tool ( #11676 )
...
* [education] Fix Course Scheduling Tool
* minor
2017-11-21 17:28:51 +05:30
Rushabh Mehta
476c66d699
[fix] tests.txt
2017-11-21 17:02:39 +05:30
Rushabh Mehta
26ca6afd11
[fix] test.txt for accounts
2017-11-21 16:17:58 +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
Makarand Bauskar
75443a94ee
[minor] set the pos profile name while creating demo ( #11664 )
2017-11-21 16:12:40 +05:30
Zarrar
f71f3af938
adding task to root node ( #11666 )
2017-11-21 16:12:01 +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
Saurabh
d503f12713
[fix] ui test-case path
2017-11-21 15:22:41 +05:30
Rushabh Mehta
5171da81a1
[minor] fix-patch
2017-11-21 15:18:47 +05:30
Nabin Hait
cc884578b5
Update sales_order.py
2017-11-21 12:24:03 +05:30
rohitwaghchaure
834541a7e8
[fix] Added primary action in the modal which will show on the submission in the pos ( #11575 )
2017-11-20 11:31:53 +05:30
Britlog
1484793055
Shopping cart addresses management ( #11657 )
2017-11-20 11:22:18 +05:30
rohitwaghchaure
179e0c1d8d
Added party name in accounts receivable/payable report ( #11656 )
2017-11-20 11:18:55 +05:30
creamdory
fd1503c6a5
[New Feature] Delivery
2017-11-20 10:28:49 +08:00
Rohit Waghchaure
77940493a8
[fix] Price list not loaded from pos profile, auto set outstanding amount in the mode of payment
2017-11-18 19:06:31 +05:30
Prateeksha Singh
e1b8629313
Fix setup wiz test ( #11640 )
...
* increase timeout in setup wiz test
* enable profile slide
2017-11-17 20:08:45 +05:30
KanchanChauhan
0fe455a991
[Minor][Bug] Fix syntax error ( #11633 )
2017-11-17 20:08:15 +05:30
Saurabh
00e82cdab3
[fix] patch fixes to setup patch tester on travis
2017-11-17 19:08:01 +05:30
Prateeksha Singh
241d64d8c1
Merge pull request #11634 from pratu16x7/variant-modal-fix
...
[minor] fix plurals spacing
2017-11-17 15:34:34 +05:30
pratu16x7
83587c72f6
[minor] fix plurals spacing
2017-11-17 15:33:12 +05:30
Saurabh
a4f78211ab
Merge branch 'master' into develop
2017-11-17 14:55:24 +05:30
Saurabh
f773af6053
bumped to version 9.2.15
2017-11-17 15:25:23 +06:00
Saurabh
11ec2c50e0
[fix] set default language in local
2017-11-17 14:51:08 +05:30
Zarrar
1b4894c33a
make root_type null if not root ( #11626 )
2017-11-17 14:32:12 +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
Saurabh
05ed86a00e
bumped to version 9.2.14
2017-11-17 14:31:29 +06:00
Rohit Waghchaure
44f7b157ff
[fix] POS redirect issue
2017-11-17 13:52:11 +05:30
Nabin Hait
7fa111de45
Update sales_invoice.py
2017-11-17 12:55:08 +05:30
Nabin Hait
6b70906deb
Update purchase_invoice.py
2017-11-17 12:54:32 +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
877e1bb377
Post GL Entry based on rounded total in Sales/Purchase Invoice ( #11542 )
2017-11-17 12:27:43 +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
Prateeksha Singh
744ff0010b
Variant report ( #11618 )
...
* Item Variant Details Report
* remove queries from inside for loop
* make attribute value map
* Update item_variant_details.py
2017-11-17 12:00:29 +05:30
hiousi
d81e9f30dd
[fix] issue #11456 ( #11612 )
...
using bench export-fixtures create a erpnext/fixtures/web_form.json file
see :
https://github.com/frappe/erpnext/issues/11456#issuecomment-344846063
2017-11-17 11:42:24 +05:30
Britlog
b6096057c6
Hide cart icon and badge count after logging out ( #11530 )
2017-11-17 11:41:35 +05:30
Britlog
2a89a502f0
[Website] Items list and stock ( #11480 )
...
* Add stock availability in items list and a parameter to set the number of products per page
* Substract reserved_qty from actual_qty for website stock
2017-11-17 11:41:07 +05:30
Vishal Dhayagude
82b200e497
[fix] Patch fail ( #11623 )
2017-11-17 11:01:42 +05:30
Britlog
d9978d9c4f
Check stock in shopping cart ( #11529 )
2017-11-16 18:38:13 +05:30
rohitwaghchaure
51a397c97f
[fix] Valuation rate in stock entry and code cleanup ( #11614 )
2017-11-16 18:23:16 +05:30
Manas Solanki
bb34c57603
link the address and contact with the sales partner ( #11592 )
2017-11-16 18:10:04 +05:30
Prateeksha Singh
8f43d2514c
Multiple variant creation dialog ( #11608 )
...
* Multiple variant creation dialog
* variant dialog codacy fixes
* [multiple variants] show_alert, and other minors
2017-11-16 18:06:26 +05:30
Nabin Hait
1749b7c16b
Minor fixes related to account renaming and deletion
2017-11-16 17:49:54 +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
Nabin Hait
46be9896a9
Account number in chart of accounts ( #10551 )
...
* Account number in chart of accounts
* Include account number while renaming account
* Test case fixed
* Standard coa with and without numbers
* Standard coa with and without numbers
2017-11-16 16:51:55 +05:30
augustinfotech
135a54ca93
Allow print before pay in POS ( #11590 )
2017-11-16 15:28:42 +05:30
tundebabzy
f7e6934d7c
handle None case in update_reserved_qty_for_production ( #11593 )
2017-11-16 14:13:49 +05:30
Manas Solanki
eb3982044b
convert html into text in the taxes description as it can break the reports ( #11603 )
2017-11-16 14:11:39 +05:30
Pawan Mehta
bda07c6db4
Added Warehouse, Cost Center, Owner filters to Sales Register ( #11600 )
...
* [fix] #3668
* fix codacy space issue
2017-11-16 14:09:17 +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
rohitwaghchaure
21cbbae88f
[fix] Payment reconcillation showing linked journal entries ( #11611 )
2017-11-16 14:05:57 +05:30
ashish
f17ca7866a
removed names from comments
2017-11-16 11:08:14 +05:30
ashish
604eb9d689
added flag to function get_customer_outstanding and removed names in comments
2017-11-16 11:05:59 +05:30
ashish
a20c8dbd5c
instead of caller as 3rd arg added a flag
2017-11-16 11:03:39 +05:30
ashish
a1feb32891
added json for bypass credit limit checkbox
2017-11-16 11:01:43 +05:30
ashish
f67372cfb3
removed logic from delivery note for checking bypass credit limit flag
2017-11-16 10:58:25 +05:30
ashish
8146c7a3df
not required as default is set by default
2017-11-16 10:54:22 +05:30
ashish
bccdf74344
set default value of bypass_credit_limit flag removed as it is not required
2017-11-16 10:53:22 +05:30
ashish
62155fa0e5
Merge branch 'feature_10861' of https://github.com/ashish-greycube/erpnext into feature_10861
2017-11-16 10:47:44 +05:30
Rushabh Mehta
8e5dcd06fb
[fix] item.py
2017-11-15 17:53:44 +05:30
Rushabh Mehta
083dabaaf8
[fix] item.py
2017-11-15 17:08:53 +05:30
Frappe PR Bot
978cfdec2c
[Translation] Updated Translations ( #11591 )
2017-11-15 16:30:08 +05:30
Rushabh Mehta
d3f5d0961a
[feature] Opening Invoice Creation Tool ( #11589 )
...
* [enhance] Opening Invoice Tool create Opening Sales/Purchase Invoices
* [minor] added progress bar while creating invoice
* [minor] allow bulk upload for the invoices
* [minor] calculate item rate from net total
* [minor] added defaults for invoices fields, create gl entries only if grand_total is greater than 0
* [minor] check mandatory values before making opening invoices
* [minor] enable primary button if there is any error while creating invoices
* [minor] minor fixes, set company currency as invoice currency added tests
* [dashboard] added Opening Invoice Summery section in Dashboard
* [minor] added total invoices count on dashboard
* [minor] don't show dashboard if there are no opening invoices available
* [minor] added Opening Invoice Tools to Account's Tools section
* [minor] codecy fixes
* [fix] refactored general ledger and buttons on charts
* [fix] tests
2017-11-15 16:29:53 +05:30
Nabin Hait
78ab8235f6
Minor code cleanups in stock balance report
2017-11-15 14:43:54 +05:30
Brown-Harry Boma
b9e44217a2
[Fix]Codacy Issues
2017-11-15 14:43:54 +05:30
Brown-Harry Boma
2da8f6e89d
Add Items Variants Attributes columns to Stock Balance Report
2017-11-15 14:43:54 +05:30
Zarrar
24b8aa2e80
set field dependent on link field fix ( #11580 )
2017-11-15 14:27:00 +05:30
Nabin Hait
6fd163bc55
Merge branch 'master' into develop
2017-11-15 14:08:17 +05:30
Nabin Hait
429e5d57d5
bumped to version 9.2.13
2017-11-15 14:38:17 +06:00
Jamsheer
0abec034df
Healthcare hotfix ( #11586 )
...
* On Cancel Consultation - Open Appointment - Delete Medical Record
* Add Filter on Account Selection - is_group: 0
* Patient Medical Record - List view Fixes
* Update consultation.py
2017-11-15 13:53:50 +05:30
Umair Sayed
3a9ca883b9
Update party.py ( #11584 )
2017-11-15 13:44:04 +05:30
Manas Solanki
bf59b5927f
make route from item code if item name is None ( #11579 )
2017-11-15 10:55:22 +05:30
ppd1990
9bd84277db
Propagate projected_qty all the way to the root warehouse to make 'check in group' actually work for more complex warehouse topologies ( #10842 )
2017-11-15 10:13:09 +05:30
schilgod
e418a5bdc1
Option to disable fetching last purchase details in Purchase Order ( #11573 )
...
* add check for enable/disable last purchase details in Purchase Order
* fix tabs
2017-11-15 09:49:49 +05:30
Jamsheer
bab226698f
Healthcare hotfix ( #11574 )
...
* Patient dashboard - Vital Signs
* Remove submit validation in Consultation
* Physician Schedule - Add Time Slots - Fix
* Patient Appointment - Client side - fixes
2017-11-15 09:47:00 +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
ea3e6b93a7
bumped to version 9.2.12
2017-11-14 18:18:42 +06:00
Nabin Hait
10823e5a25
Merge branch 'neilLasrado-develop1' into develop
2017-11-14 17:40:45 +05:30
Nabin Hait
b55e98570f
Minor fixes
2017-11-14 17:40:30 +05:30
Shreya Shah
be690ef817
Rate with margin in customer and company currency ( #11437 )
...
* field for company margin
* added base_rate_with_margin
* calculate company margin
* test for item price
* test for delivery note
* test for sales order
* test for quotation
* test for sales invoice
2017-11-14 17:22:41 +05:30
Nabin Hait
42274a4591
Delete healthcare domain items ( #11567 )
2017-11-14 17:15:11 +05:30
Nabin Hait
cd13a28417
Get items from quotation in sales invoice
2017-11-14 17:13:53 +05:30
AravindPranera
04e3518fad
Update request_for_quotation.py
2017-11-14 17:13:53 +05:30
AravindPranera
5bae488f25
Update request_for_quotation.py
2017-11-14 17:13:53 +05:30
AravindPranera
86e726158b
Getting Quotation Document in Sales Invoice
2017-11-14 17:13:53 +05:30
AravindPranera
0ebd3c373c
Getting Quotation Document in Sales Invoice
2017-11-14 17:13:53 +05:30
Rushabh Mehta
b8b8dc119f
[fix] item.py fix for _doc_before_save
2017-11-14 16:52:05 +05:30
Rushabh Mehta
cc1262c36d
Add option to clean description html in item description. ( #11565 )
...
* [fix] add item settings
* [docs] Item Settings
* [fix] enqueue in item_settings.py
* [refactor] move to stock settings
* [refactor] move to stock settings
2017-11-14 16:36:25 +05:30
Rushabh Mehta
d5c6416d91
[new feature] Product Configurator (via Item Quick Entry) ( #11535 )
...
* [Feature] Item Variant Creation from Quick Entry
* [minor] formatted js
* [minor] set 3 attribute per page instead of 5 in template
* [fix] fixed codecy issue
* [fix] label translation
* [minor] changed trigger event of item template
* [fix] moved item ui tests under stock
* [UI test] added test for item attribute
* [UI test] added test for creation of item variant from quick entry
* [fix] item variant ui test fixes
* [wip]
* [cleanup] item quick entry
* [remove] tests, fixtures were missing
* [refactor] use set_only_once in item
2017-11-14 15:27:28 +05:30
tunde
ffa659fd2c
Merge branch 'develop' into payment-terms
2017-11-14 09:59:45 +01:00
Nabin Hait
4d99ebaeb5
Merge branch 'master' into develop
2017-11-14 13:58:37 +05:30
Nabin Hait
0590d1da05
bumped to version 9.2.11
2017-11-14 14:28:37 +06:00
Rushabh Mehta
d8bc8de6ca
[minor] remove unnecessary description in upload attendance, fixes #10603
2017-11-14 12:52:53 +05:30
Rushabh Mehta
98aa581864
[fix] default tax only on insert ( #11544 )
...
* [fix] default tax only on insert
* [fix] default tax only on insert
* [fix] default tax only on insert
2017-11-14 09:32:32 +05:30
Faris Ansari
3a5dceae18
Add Github Connector ( #11259 )
...
- Add new module ERPNext Integrations
2017-11-13 19:19:13 +05:30
Manas Solanki
e5aa9c5f2f
new report - assessment plan status ( #11504 )
...
* new report - assessment plan status
* add the report in the school dashboard
* fix for the print format
2017-11-13 18:56:53 +05:30
Manas Solanki
69be5362a5
minor fixes in the assessment result ( #11543 )
2017-11-13 18:32:06 +05:30
Nabin Hait
ec8a0a22d7
Merge branch 'master' into develop
2017-11-13 15:10:17 +05:30
Nabin Hait
58ab203fc0
bumped to version 9.2.10
2017-11-13 15:40:16 +06:00
Nabin Hait
6605919ecd
GL Entries on sale of an asset ( #11538 )
2017-11-13 15:06:35 +05:30
Saurabh
feeb47dbbe
[fix] if not students in student groups then raise exception ( #11537 )
2017-11-13 13:52:58 +05:30
Nabin Hait
deeb1380b1
Ignore paid credit note in outstanding invoices in Payment Entry ( #11534 )
2017-11-13 13:52:05 +05:30
Saurabh
0f86d86e27
[fix] validate party account ( #11517 )
2017-11-10 19:21:09 +05:30
Faris Ansari
4ec4e3fb29
[patch] Revert Manufacturing User role ( #11514 )
2017-11-10 19:15:17 +05:30
Prateeksha Singh
17b7209032
remove erroneous column breaks ( #11522 )
2017-11-10 18:54:03 +05:30
Prateeksha Singh
731b66b788
remove erroneous column breaks ( #11523 )
2017-11-10 18:53:52 +05:30
Rushabh Mehta
4313326ba0
[fix] treeview for tasks ( #11515 )
...
[fix] treeview for tasks
2017-11-10 18:52:21 +05:30
Saurabh
a5275a1ba9
Merge branch 'master' into develop
2017-11-10 15:53:44 +05:30
Saurabh
a10cd10640
bumped to version 9.2.9
2017-11-10 16:23:43 +06:00
Saurabh
44ef8654f9
Merge pull request #11510 from rohitwaghchaure/issue_11502
...
Add item directly in the cart only if serial no, batch, barcode has enter in the search field
2017-11-10 15:51:14 +05:30
Saurabh
71862f9024
Merge pull request #11509 from saurabh6790/bom_search_query_fix
...
[fix] query param fixes
2017-11-10 15:50:55 +05:30
Rohit Waghchaure
a5e3c3a79f
Add item directly in the cart only if serial no, batch, barcode has enter in the search field
2017-11-10 15:29:26 +05:30
rohitwaghchaure
cc97ec9202
[hotfix] Salary slip, leave considered in amount calculation even if depends on lwp is disabled in salary slip ( #11507 )
2017-11-10 15:06:58 +05:30
Saurabh
022ab63a0f
[fix] query param fixes
2017-11-10 15:06:02 +05:30
Pawan Mehta
1368ba00bc
[fix] #11337 ( #11339 )
2017-11-10 14:59:26 +05:30
Saurabh
7b78a83592
Merge branch 'master' into develop
2017-11-10 13:15:04 +05:30
Saurabh
18c8cf965f
bumped to version 9.2.8
2017-11-10 13:45:04 +06:00
Saurabh
7ab28ec562
[fix] give preference to gateway selected on shopping cart settings ( #11393 )
2017-11-10 11:17:01 +05:30
KanchanChauhan
e59c9ce9f4
Checkbox has_expiry_date in Item to make suer Expiry Date is entered in Batch ( #11413 )
2017-11-10 11:16:29 +05:30
Alchez
1077c782a3
[Fix] Packing Slip creation if custom field does not have a value ( #11423 )
...
* [Fix] Packing Slip creation if custom field is Column/Section Break
* Used no_value_fields and sorted imports
* Update packing_slip.py
2017-11-10 11:14:57 +05:30
Nabin Hait
15753074bf
Nestedset model fixes for changing parent and renaming ( #11467 )
2017-11-10 11:12:43 +05:30
Nabin Hait
8e3da7f70e
Update test_assessment_plan.js
2017-11-10 10:59:17 +05:30
Nabin Hait
887285ed1a
Update test_assessment_plan.js
2017-11-10 10:59:07 +05:30
Manas Solanki
aeb0026354
commits from develop merged PR's ( #11491 )
...
* better student search queries and minor fixes in the student group
* remove the print option for the tools
* fixes for the chart
* minor fixes in the fee module for print and permission, delete redundant doctype
* set the naming series and independent dob validation
2017-11-10 10:58:43 +05:30
rohitwaghchaure
1ce48e7032
[fix] POS profile patch ( #11501 )
2017-11-10 10:53:12 +05:30
Faris Ansari
99e31f97b8
set default params for paging ( #11500 )
2017-11-10 10:50:49 +05:30
Faris Ansari
4a864c1eea
[fix] Update bom item description ( #11498 )
...
* [fix] Update bom item description
* Update item.py
2017-11-09 19:01:21 +05:30
Nabin Hait
c4de619eac
Update assessment_plan.py
2017-11-09 14:36:11 +05:30
Nabin Hait
fe72ed003e
Update test_assessment_plan.js
2017-11-09 11:47:13 +05:30
pratu16x7
40016372c6
[minor][hotfix] naming_series variable assignment
2017-11-08 16:30:15 +05:30
Saurabh
b97f08e0ac
[fixed] merge-conflicts
2017-11-08 15:08:38 +05:30
Saurabh
3894a5ed94
bumped to version 9.2.7
2017-11-08 15:37:33 +06:00
Saurabh
045b2877b7
[fix] remove warehouse from Stock Settings if warehouse wont exists ( #11487 )
2017-11-08 14:57:03 +05:30
Manas Solanki
a658630751
remove the print option from the tools ( #11484 )
...
* remove the print option for the tools
* better student search queries and minor fixes in the student group
2017-11-08 14:55:54 +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
eb760d6d09
Merge branch 'master' into develop
2017-11-08 12:20:46 +05:30
Saurabh
f985ae1379
bumped to version 9.2.6
2017-11-08 12:50:46 +06:00
Saurabh
98aa544f25
Merge branch 'master' into staging
2017-11-08 12:18:50 +05:30
Saurabh
f41b13b736
[fix] merge-conflicts
2017-11-08 12:18:41 +05:30
Saurabh
db781e607a
bumped to version 9.2.5
2017-11-08 12:42:37 +06:00
rohitwaghchaure
521606e433
Merge pull request #11398 from rohitwaghchaure/item_variants_donot_copy_option
...
[enhance] In item variants settings added provision, do not update the variants of variants from the template but will copy the value while making new variant aginst the template
2017-11-08 11:49:24 +05:30
Rohit Waghchaure
acc8995c48
[enhance] In item variants settings added provision, do not update the fields of variants from the template but will copy the value while making new variant aginst the template
2017-11-08 11:39:08 +05:30
Sushant Nadkar
72c40f0383
Enabled track seen for Sales Order, Sales Invoice, Production Order, and Delivery Note ( #11440 )
2017-11-08 11:35:46 +05:30
Shreya Shah
d9e2b24535
task name in gantt view - clickable ( #11459 )
2017-11-08 11:35:19 +05:30
rohitwaghchaure
f688af3809
[fix] Offline pos name is not defined issue in the POS ( #11469 )
2017-11-08 11:33:39 +05:30
Achilles Rasquinha
7fd20f303f
moved from MySQLdb to pymysql ( #11462 )
2017-11-08 11:33:24 +05:30
rohitwaghchaure
9f2a27c99c
Merge pull request #11477 from rohitwaghchaure/pos_profile_test_cases
...
[fix] POS Profile test cases
2017-11-07 16:35:52 +05:30
Rohit Waghchaure
35fc45eff9
[fix] POS Profile test cases
2017-11-07 10:43:16 +05:30
Rohit Waghchaure
57cc924d29
[Fix] Fast clicking on an item, showing invalid grand total and quantity in the POS cart
2017-11-06 18:42:37 +05:30
Manas Solanki
36e2fb8d58
minor fixes in the fee module for print and permission, delete redundant doctype ( #11430 )
2017-11-06 17:44:59 +05:30
Nabin Hait
e552a51266
Minor cleanups
2017-11-06 17:39:31 +05:30
pawan
436f7b980c
codacy issues
2017-11-06 17:39:31 +05:30
pawan
438dfc081b
fix codacy issues
2017-11-06 17:39:30 +05:30
pawan
d59225635d
remove old report
2017-11-06 17:39:30 +05:30
pawan
b699b86b76
Add Total Row
2017-11-06 17:39:30 +05:30
pawan
8d1d64aa29
[fix] #11449
2017-11-06 17:39:30 +05:30
pawan
e61a275651
[fix] #11427
2017-11-06 17:39:30 +05:30
Manas Solanki
6ba2eda04a
fixes for the chart ( #11460 )
2017-11-06 17:22:14 +05:30
rohitwaghchaure
bcb7854340
Merge pull request #10982 from netchampfaris/multiple-users-pos-profile
...
[Enhancement] Allow Multiple users in POS Profile
2017-11-06 16:45:01 +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
Manas Solanki
b1616a0cb3
changes in thepos profile
2017-11-06 13:53:52 +05:30
Manas Solanki
3f0dfd720f
set the pos profile in the sales invoice
2017-11-06 13:53:52 +05:30
Nabin Hait
f15a8409eb
[tests] Test case fixes for task and project ( #11445 )
...
* [tests] Test case fixes for task and project
* Removed hard-coded dates from test cases
* Codacy fix
2017-11-06 11:11:34 +05:30
Saurabh
e850655c1d
Merge branch 'master' into staging
2017-11-03 16:56:24 +05:30
Saurabh
0faa61009f
Merge branch 'master' into develop
2017-11-03 16:56:23 +05:30
Saurabh
56cb0aa9c1
bumped to version 9.2.4
2017-11-03 17:26:23 +06:00
Faris Ansari
cbaa0e629c
fix codacy
2017-11-03 11:35:49 +05:30
Manas Solanki
76ce074c63
return the account details if and only if there is single account of that type ( #11407 )
2017-11-02 18:12:47 +05:30
rohitwaghchaure
7677ff00a2
[hotfix] User not able to edit exchange rate even if Allow Stale Exchange Rates is disabled in the accounts settings ( #11409 )
2017-11-02 18:12:14 +05:30
Saurabh
62fd4007b0
Merge branch 'master' into staging
2017-11-02 12:14:42 +05:30
Saurabh
3be72ef187
Merge branch 'master' into develop
2017-11-02 12:14:41 +05:30
Saurabh
870ce3cfea
bumped to version 9.2.3
2017-11-02 12:44:40 +06:00
rohitwaghchaure
1473a37d8c
Merge pull request #11395 from jay-parikh/develop
...
POS - Add % to the Discount Field #9749
2017-11-02 12:11:12 +05:30
Saurabh
0ad2cc3def
Merge pull request #11403 from tundebabzy/issue-11402
...
Error In Employee Loan Form (#11402 )
2017-11-02 12:09:54 +05:30
Saurabh
00f6c2d61d
Merge pull request #11417 from rohitwaghchaure/issue_not_save_v9
...
[Fix] Customer is manadatory even if customer has selected in the Issue
2017-11-02 12:07:32 +05:30
Saurabh
38008f8daa
Merge pull request #11406 from rohitwaghchaure/payment_entry_differnece_amount_issue
...
[Fix] Wrong difference amount in the payment entry for the internal transfer type
2017-11-02 12:07:14 +05:30
Saurabh
afb63af3b6
Merge pull request #11397 from rohitwaghchaure/delivery_note_issue_from_so
...
[Fix] Getting an error while making delivery note from sales order and sales order has no item code
2017-11-02 12:06:08 +05:30
Rohit Waghchaure
816ce33daf
[Fix] Customer is manadatory even if customer has selected in the Issue
2017-11-01 19:02:09 +05:30
Rohit Waghchaure
99748dbacf
[Fix] Wrong difference amount in the payment entry for the internal transfer type
2017-11-01 11:45:02 +05:30
tunde
31287b00a6
call get_employee_loan_application only when appropriate
2017-10-31 18:10:17 +01:00
Faris Ansari
3d59179205
Load default pos profile if not found
2017-10-31 21:56:16 +05:30
Manas Solanki
a941a394ba
set the naming series and independent dob validation
2017-10-31 17:34:50 +05:30
Rohit Waghchaure
5ec9f6930b
[Fix] Getting an error while making delivery note from sales order and sales order has no item code
2017-10-31 15:26:56 +05:30
Jay Parikh
96f167573b
POS - Add % to the Discount Field #9749
2017-10-31 01:07:09 -07:00
Zarrar
6d41a9a647
Converting Task to a Tree structure ( #11117 )
...
* added support for tree view
* nestedset added to handle tree based structure
* treeview ui added
* removed is_group dependency
* added validation while editing a group-task
* codacy fix
* BOM like filter added
* Added ui-test for treeview-task
2017-10-31 13:10:55 +05:30
Manas Solanki
160e710ebf
set bank account only if there is single bank type account ( #11363 )
...
* set bank account only if there is single bank type account
* Update journal_entry.py
2017-10-31 13:04:02 +05:30
Faris Ansari
40611e4f69
[fix] hub get_item_details ( #11383 )
2017-10-31 13:00:09 +05:30
KanchanChauhan
21f946f365
[Minor] Source Warehouse should be filtered by Company in Production Order ( #11376 )
2017-10-31 12:59:45 +05:30
Prateeksha Singh
6b26e391b8
use the new frappe charts :D ( #11391 )
2017-10-31 12:58:48 +05:30
Faris Ansari
895aa7b7ac
fix codacy
2017-10-30 17:12:50 +05:30
Faris Ansari
7095de03ef
Merge branch 'develop' into multiple-users-pos-profile
2017-10-30 15:00:55 +05:30
Faris Ansari
79be8f969f
Add to patches.txt
2017-10-30 14:46:09 +05:30
ci2014
e741b91f1d
Update issue.js ( #11381 )
...
Make the close / reopen button more flexible for customized user status.
For example, if the user has several status, it will now show the Close button every time the ticket is not closed! It will show Reopen only, if the ticket is closed, and not if it's on hold for example.
This will make it more flexible.
2017-10-30 10:13:05 +05:30
tunde
5ea10a77a3
Merge branch 'develop' into payment-terms
2017-10-27 17:37:15 +01:00
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
ashish
b883e4ee0d
customer.py -- get_credit_limit function which gets called by the above customer_credit_balance report is updated to deduct the amount of sales order for which credit limit bypass flag is set. cint function is added.
2017-10-26 20:32:08 +05:30
ashish
ca2250c440
sales_invoice.py -- Check credit limit when make delivery is done from sales invoice.We need to check the credit limit as there could be multiple partially paid sales order(note we are bypassing credit check at sales order) so we need to recheck credit balance of customer to avoid any delivery crossing credit limit from sales invoice.cint function is added.
2017-10-26 20:22:34 +05:30
ashish
751b05f1e8
sales_order.py -- Three changes are done (a) if bypass credit limit check is enabled we should not check customer credit on submit of sales order (b.1/b.2) There is provision to make delivery note and sales invoice from sales order. Since credit limit is bypassed at sales order level we need to check credit of customer on make of (b.1)delivery note or (b.2)sales invoice. cint function is added.
2017-10-26 20:15:24 +05:30
ashish
9dfc0f32ab
customer.json -- a checkbox field is added which gives user ability to bypass credit limit check at sales order level for a customer. It is default to 0. Also patch is added to update value of new field to 0 after migrate.
...
test_customer.js -- It is auto generated file as customer.json is modified. And it is removed.
2017-10-26 20:07:32 +05:30
tunde
bbce7b7e5d
get attribute with get method
2017-10-26 14:31:13 +01:00
tunde
6575a615b1
get attribute with get method
2017-10-26 14:30:18 +01:00
tunde
14e97ce0c8
Merge branch 'develop' into payment-terms
2017-10-26 13:35:42 +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
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
d0131762cc
bumped to version 9.2.1
2017-10-26 10:29:22 +06:00
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
ashish
8fbf10f5db
New test case files added.(a)test_sales_order_with_bypass_credit_limit_check.js -- New feature: i.e. bypass credit limit check at sales order.(b)test_sales_order_without_bypass_credit_limit_check.js --Regression test case : the existing default flow is checked i.e. credit limit check happens at sales order level
2017-10-25 16:20:50 +05:30
ashish
fb364df091
customer_credit_balance.py -- Credit limit should now reflect outstanding amount for each customer based on value of flage bypass credit limit check at sales order level. A new column is added to show the value of this flag. customer.py -- get_credit_limit function which gets called by the above customer_credit_balance report is updated to deduct the amount of sales order for which credit limit bypass flag is set
2017-10-25 16:17:55 +05:30
ashish
ff20182d03
sales_invoice.py -- Check credit limit when make delivery is done from sales invoice.We need to check the credit limit as there could be multiple partially paid sales order(note we are bypassing credit check at sales order) so we need to recheck credit balance of customer to avoid any delivery crossing credit limit from sales invoice
2017-10-25 16:11:58 +05:30
ashish
8ad4efee25
sales_order.py -- Three changes are done (a) if bypass credit limit check is enabled we should not check customer credit on submit of sales order (b.1/b.2) There is provision to make delivery note and sales invoice from sales order. Since credit limit is bypassed at sales order level we need to check credit of customer on make of (b.1)delivery note or (b.2)sales invoice
2017-10-25 16:07:21 +05:30
ashish
06e6a82d56
customer.json -- a checkbox field is added which gives user ability to bypass credit limit check at sales order level for a customer. test_customer.js : auto generated file as customer.json is modified
2017-10-25 15:56:39 +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
8f2500083c
Merge branch 'master' into develop
2017-10-25 14:10:39 +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
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
Nabin Hait
8a0943ead7
Unlink reference doc on Journal Cancellation only if advance ( #11285 )
2017-10-25 11:46:35 +05:30
Nabin Hait
82c9352d53
Update variant description based on attribute if not already there ( #11302 )
2017-10-25 11:46:20 +05:30
rohitwaghchaure
311823aca1
Validate stock exists against template item ( #11305 )
2017-10-25 11:45:51 +05:30
Charles-Henri Decultot
7862eb444f
[Hotfix] Addition of an empty tax group in the french CoA ( #11306 )
2017-10-25 11:44:46 +05:30
Neil Trini Lasrado
1f99bea6ce
Pass sender as contact email in Opportunity ( #11308 )
...
Always pass sender as the contact email while creating an opportunity for a website enquiry.
2017-10-25 11:44:12 +05:30
Manas Solanki
a5eee4629f
Fix UI tests ( #11309 )
...
* decrease the timeout
* delete the duplicate test
2017-10-25 11:42:22 +05:30
Nabin Hait
6c06e700d6
[Fix] Unallocated amount considering deductions ( #11314 )
2017-10-25 11:42:05 +05:30
Revant Nandgaonkar
f8006b140f
[Docs] Map field renamed to Geolocation
2017-10-25 11:18:29 +05:30
tunde
c8d2361b81
Merge branch 'develop' into payment-terms
2017-10-24 12:25:29 +01:00
Revant Nandgaonkar
010f619ed3
[Docs] added field for storing map
...
related PR https://github.com/frappe/frappe/pull/4327
2017-10-23 17:25:52 +05:30
vishalseshagiri
5c5a853894
Update customer_group.py ( #11270 )
...
Minor syntactical error !
2017-10-23 11:35:49 +05:30
Doridel Cahanap
b06f155ceb
[minor] Set Quick Entry to False in Training Event ( #11279 )
2017-10-23 11:35:12 +05:30
Nabin Hait
7533101d4b
Merge branch 'master' into develop
2017-10-21 11:29:40 +05:30
Nabin Hait
e7eda65968
bumped to version 9.1.7
2017-10-21 11:59:39 +06:00
rohitwaghchaure
5fdd26f1e7
[fix] Discount amount not reset for new order in offline pos ( #11258 )
2017-10-21 11:23:45 +05:30
Nabin Hait
c44290955e
Minor fix in patches ( #11268 )
2017-10-21 11:20:18 +05:30
Nabin Hait
4825eccad5
UI test fixed for supplier quotation ( #11260 )
...
* UI test fixed for supplier quotation
* ui test fixes for purchase order
* Fixed number of assertion in student admission test
* Fixed multiple ui tests
* ui tests
2017-10-21 10:44:30 +05:30
Doridel Cahanap
5a4d5bfaf2
Add Training Program DocType, Script, Path and Doc ( #11181 )
...
* Add Training Program Doctype, Script, Config and documentation
* Add Training Program to Training Event
* [Test Case] Training Event in a Training Program
2017-10-20 11:31:15 +05:30
Nabin Hait
b4f5f14438
Timeout increased for setting __newname ( #11252 )
...
* Timeout increased for setting __newname
* UI test fixes
* fixed ui test for PO
* ui tests
* ui tests
* ui tests
* ui tests
* ui tests
2017-10-20 11:26:17 +05:30
tunde
09ce68ec19
Merge branch 'develop' into payment-terms
2017-10-19 17:47:31 +01:00
Nabin Hait
bb60a59b96
Fixed asset test cases due to tax rule ( #11247 )
...
* Fixed asset testcases due to tax rule
* Delete tax rule record after running test cases
* Fixed test cases
* Fixed test cases
* Fixed subscription tests due to tax rule
2017-10-19 12:14:37 +05:30
Neil Trini Lasrado
eb662b5a9a
Added Test Cases
2017-10-18 18:16:47 +05:30
Neil Lasrado
7935d186f9
Auto set warehouses in Production Order if default warehouses are set in Manufacturing Settings and not mentioned in Production Order
2017-10-18 18:16:47 +05:30
Neil Lasrado
af091ac5dd
[BUG] Map Production Order with the exact Sales Order line item
2017-10-18 18:16:46 +05:30
Neil Lasrado
5afc194742
[BUG] Fixes make Production Order from Sales Order
2017-10-18 18:16:46 +05:30
Saurabh
5fa2adcca9
Merge branch 'master' into develop
2017-10-18 16:23:44 +05:30
Saurabh
47e405516b
bumped to version 9.1.6
2017-10-18 16:53:43 +06:00
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
Ranjith Kurungadam
7624e7bf85
[hot-fix] sql getting translated ( #11243 )
...
* fix remove _ in frappe.sql
* use %s replacement for sql
2017-10-18 15:48:12 +05:30
Jamsheer
dd7c1b87c5
Healthcare Doctypes - Docfield Clean up ( #11065 )
...
* Healthcare Doctype Clean up - updated index, in_filter, no_copy and ect.
* Healthcare Doctype - remove frappe import
2017-10-18 12:13:15 +05:30
Makarand Bauskar
3e4ca4219f
[hotfix] fixed 'ValueError: Unknown string format' error if the from_time value is null ( #11162 )
2017-10-18 11:16:47 +05:30
Helkyd
7ec7a45f05
Salary Detail Abbr ( #11165 )
...
When processing via Process Salary Abbr is not filled unless if Hourly pay ... this is required for later check what Component is or was added for Employee
2017-10-18 11:16:24 +05:30
Nabin Hait
cfb68dee34
Merge branch 'develop' into develop
2017-10-18 11:16:17 +05:30
Vishal Dhayagude
3e02d80636
[fix] Travis Client Side Failure ( #11198 )
2017-10-18 11:10:45 +05:30
Nabin Hait
5ab6ff2470
[fix] Fetch raw material rate based on last purchase rate ( #11205 )
...
* [fix] Fetch raw material rate based on last purchase rate
* Don't fetch sub-assembly item rate from BOM if not mentioned by the user
2017-10-18 11:09:11 +05:30
Brown-Harry Boma
11e964d442
Set transaction type in pricing rule only if unavailable ( #11229 )
...
* Set transaction type in pricing rule only if unavailable
* Update pricing_rule.py
2017-10-18 11:07:09 +05:30
rohitwaghchaure
a516856c32
[Fix] Getting an error duplicate name while making an invoice in draft mode ( #11230 )
2017-10-18 11:05:10 +05:30
Javier Wong
84f7ba8699
[hotfix] Allow Sales User and Purchase User to Read Account Settings ( #11233 )
...
* [hotfix] Allow Sales User and Purchase User to Read Account Settings
This fixes https://discuss.erpnext.com/t/not-permitted-message-for-new-quotation-and-sales-order/29261/4 .
* Added back Accounts Manager Permissions
2017-10-18 11:04:15 +05:30
rohitwaghchaure
a3fe5b8528
[Fix] Disable desk access view to supplier ( #11234 )
2017-10-18 10:53:34 +05:30
jigneshpshah
bad5e90e46
Priority of credit limit check functionality ( #11232 )
...
CREDIT LIMIT field is at customer, customer group and company level .
Explanation given on priority of the three levels.
2017-10-18 10:53:11 +05:30
Nabin Hait
a9feddbb79
Testcase fixes ( #11238 )
...
* Restaurant test records fixed
* Fixes for test cases
2017-10-18 10:52:48 +05:30
KanchanChauhan
44734049f5
[Minor] Populate Expense Claim Description from Expense Claim Type ( #11156 )
2017-10-17 17:23:26 +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
Prateeksha Singh
bfb108d722
Replace c3 ( #11112 )
...
* [charts] replace in asset.js
* replace in reports
2017-10-17 12:03:02 +05:30
Nabin Hait
45a640df08
Update payment_entry_reference.json
2017-10-16 12:58:32 +05:30
Nabin Hait
53659cf0bd
Update payment_entry_reference.json
2017-10-16 12:57:51 +05:30
Makarand Bauskar
80f333950b
[minor] fixed AttributeError: 'GrossProfitGenerator' object has no attribute 'grouped_data' ( #11195 )
2017-10-16 11:27:22 +05:30
mbauskar
cd4202c2f7
Merge branch 'master' into develop
2017-10-15 19:10:56 +05:30
mbauskar
bbbce58884
bumped to version 9.1.5
2017-10-15 19:40:55 +06:00
rohitwaghchaure
8bf7230fcc
[Fix] New invoice showing old paid amount if POS Profile is not created ( #11160 )
2017-10-15 19:09:14 +05:30
rohitwaghchaure
496174bbdf
[Fix] Naming series not copy from referebce document to new document in subscription ( #11196 )
2017-10-15 19:08:42 +05:30
Nabin Hait
4072d71769
Delete api.py
2017-10-11 23:53:57 +05:30
Helkyd
e9f2b176bc
Salary Detail Abbr
...
When processing via Process Salary Abbr is not filled unless if Hourly pay ... this is required for later check what Component is or was added for Employee
2017-10-11 15:02:27 +01:00
Faris Ansari
7997271368
[hub] fix company page routing
2017-10-11 15:46:21 +05:30
Saurabh
5ffed60916
Merge branch 'master' into develop
2017-10-11 14:39:11 +05:30
Saurabh
15411fcf70
bumped to version 9.1.4
2017-10-11 15:09:10 +06:00
rohitwaghchaure
76a9cefc9c
Merge pull request #11151 from rohitwaghchaure/minor_fix_title
...
[minor] Title not showing in payment modal
2017-10-11 12:05:29 +05:30
Rohit Waghchaure
4f7873b9df
[minor] Title not showing in payment modal
2017-10-11 12:03:49 +05:30
Saurabh
ad9afe68f3
Merge pull request #11119 from rohitwaghchaure/default_company_pos
...
[enhance] Provision to select company in the POS screen if company is not defined in the global defaults
2017-10-11 12:00:56 +05:30
Saurabh
41e2b98b63
Merge pull request #11137 from mbauskar/healthcare
...
[hotfix] passed localise item_group value for create_lab_test_itemsfield
2017-10-11 12:00:12 +05:30
Rohit Waghchaure
3f309e1c20
Multiple items showing for single barcode
2017-10-11 02:14:56 +05:30
Rohit Waghchaure
9bb81ee1cb
[fix] Total amount showing wrong in the payment modal if user has changed the qty after payment
2017-10-11 01:54:36 +05:30
Makarand Bauskar
4cdb9dee09
[minor] changed the modified date for the subscription doctype ( #11142 )
2017-10-10 18:41:00 +05:30
mbauskar
ee9da67173
[hotfix] passed localize item_group value for create_lab_test_itemsfield
2017-10-10 12:20:45 +05:30
Saurabh
9893a2d608
Merge branch 'master' into develop
2017-10-10 11:22:39 +05:30
Saurabh
47b2a5f7d1
bumped to version 9.1.3
2017-10-10 11:52:38 +06:00
tunde
37c2b6116c
Merge branch 'develop' into payment-terms
2017-10-09 15:42:47 +01:00
Faris Ansari
172f28fa06
Merge pull request #11133 from netchampfaris/fix-hub-sync
...
fix Hub Sync plan
2017-10-09 19:31:08 +05:30
Faris Ansari
d635a2646b
fix Hub Sync plan
2017-10-09 19:30:11 +05:30
Saurabh
f347e23556
[fix] upload attendacne with with no_socketio param
2017-10-09 16:13:21 +05:30
mbauskar
966b3c156a
[conflicts] resolved merge conflicts
2017-10-09 15:20:30 +05:30
mbauskar
f9577652a0
bumped to version 9.1.2
2017-10-09 15:48:51 +06:00
tunde
e27f5dee1f
Merge branch 'develop' into payment-terms
2017-10-09 10:11:05 +01:00
Rohit Waghchaure
d270748eea
[Fix] Provision to select company in the POS screen if company is not defined in the global defaults
2017-10-09 12:54:26 +05:30
Doridel Cahanap
5ba39f3f83
Add has_certificate and level fields in Training Event ( #11093 )
2017-10-09 12:45:28 +05:30
tundebabzy
2622d370c6
deal zero division possibility ( #11098 )
2017-10-09 12:44:24 +05:30
rohitwaghchaure
e181dd4c24
[patch] To add healthcare domain ( #11105 )
2017-10-09 12:43:36 +05:30
tundebabzy
7f9d75521e
Confirmation desired before cancelling appointment ( #10996 ) ( #11106 )
...
* shows confirm dialog when user clicks cancel
* indentation and frm as per review
2017-10-09 12:43:18 +05:30
Makarand Bauskar
eaf0abedd4
[hotfix] ignore if student email address field value is None ( #11116 )
2017-10-09 12:42:18 +05:30
Manas Solanki
f91ad75b5a
test, patch, docs for student admission ( #11075 )
2017-10-09 12:41:24 +05:30
tunde
1db7faa862
Merge branch 'develop' into payment-terms
2017-10-06 09:37:10 +01:00
Doridel Cahanap
5cb6c38a34
Add Calendar in Training Event Doctype ( #11090 )
2017-10-06 11:50:05 +05:30
Rohit Waghchaure
62ce218fc2
Show total instead of net total
2017-10-06 11:16:46 +05:30
Rohit Waghchaure
beeba8b37a
[Fix] Discount field not displaying in offline POS
2017-10-06 09:50:43 +05:30
Rohit Waghchaure
b870d0081b
[fix] Online print format in pos profile field not displaying
2017-10-06 09:31:40 +05:30
tunde
d82677f1e6
Merge branch 'develop' into payment-terms
2017-10-06 02:23:45 +01:00
Nabin Hait
7eaeec951d
Merge branch 'schilgod-develop' into develop
2017-10-05 19:54:17 +05:30
Nabin Hait
5a834209d0
Cleanup of PO schedule date pull requests
2017-10-05 19:51:10 +05:30
Faris Ansari
e3a5899980
[hub] Add hub category filters, fix minor issues ( #11079 )
2017-10-05 19:43:08 +05:30
Stavros Anastasiadis
455c3ebb27
Add as optional field link Company ( #11068 )
2017-10-05 18:45:37 +05:30
Stavros Anastasiadis
58b587834e
Provide a minor warning message if no stock levels are availiable ( #11074 )
...
* Provide a minor warning message if no stock levels are availiable
* Update item_dashboard.js
2017-10-05 18:44:50 +05:30
Stavros Anastasiadis
e31757b001
Show Stock Level section only to stock maintain items ( #11073 )
2017-10-05 18:41:51 +05:30
rohitwaghchaure
e0dfd1608e
[Fix] Auto add item in the cart if sinfle items found in the serach ( #11072 )
2017-10-05 18:30:51 +05:30
Nabin Hait
395cf4689b
Cleanup of schedule date functionality in Material Request
2017-10-05 18:27:37 +05:30
Prateeksha Singh
925e9776e8
[hub] rename is_hub_item to is_item_from_hub ( #11069 )
...
* [hub] rename is_hub_item to is_item_from_hub
* [rename] is_hub_item to is_item_from_hub
2017-10-05 17:17:41 +05:30
AravindPranera
9c0d30a087
Fetching Document ID also in Email Subject while clicking "Send Supplier Emails" button ( #10874 )
2017-10-05 17:08:32 +05:30
Utkarsh Goswami
4cb4d2f155
Tests for payment entry against purchase invoice ( #10930 )
2017-10-05 16:51:42 +05:30
Utkarsh Goswami
975d28307a
Payroll feature ( #10900 )
2017-10-05 15:59:51 +05:30
rohitwaghchaure
607b5d4985
[Fix] Negative qty issue in POS ( #11070 )
...
* [Fix] Negative qty issue in POS
* Update point_of_sale.js
2017-10-05 15:57:58 +05:30
Stavros Anastasiadis
ea390effa5
Add multirows in Attendees selection ( #11067 )
2017-10-05 15:31:25 +05:30
Nabin Hait
34ad2e6a60
Use format_currency only if fieldtype is currency
2017-10-05 15:28:43 +05:30
Nabin Hait
f8ad0cbe70
Merge branch 'develop' of https://github.com/Helkyd/erpnext-1 into Helkyd-develop
2017-10-05 15:02:50 +05:30
Manas Solanki
0518001bdc
Changes in Student Admission ( #11019 )
...
* configurable student admission
* validate dob and admission date from student admission
* add in hooks and fix codacy
2017-10-05 14:31:31 +05:30
Doridel Cahanap
25db832be1
[minor] Add "Attendance" in grid view for Training Event Employee ( #11063 )
2017-10-05 14:20:43 +05:30
Makarand Bauskar
f23788bb7d
[hotfix] Show Make button only for Email communication ( #10876 )
2017-10-05 14:19:45 +05:30
mbauskar
74ce391303
Merge branch 'master' into develop
2017-10-05 13:36:50 +05:30
mbauskar
8c3d19e2ab
bumped to version 9.1.1
2017-10-05 14:06:49 +06:00
Rohit Waghchaure
f7a856b913
[Fix] Rate not fetched in the POS, User trying to add an item in the cart before loading of frm
2017-10-05 13:31:29 +05:30
Nabin Hait
26507d7867
Removed deprecated hub functions
2017-10-05 13:10:32 +05:30
Nabin Hait
d6d99e0d59
Removed duplicate field related to hub from Item
2017-10-05 12:39:42 +05:30
Nabin Hait
729aa2025a
Show commission section for pos as well ( #11059 )
2017-10-05 12:21:36 +05:30
Nabin Hait
7d4fd35aa3
Add POS Settings link in Accounts module ( #11060 )
2017-10-05 12:20:33 +05:30
rohitwaghchaure
e87a076f1d
Update link in the pos for offline and online mode from pos settings ( #11061 )
2017-10-05 12:20:20 +05:30
Faris Ansari
fd345f8e90
Hub ( #10934 )
...
* [WIP]Hub
* [listing] Show items, users and item_groups
* Show filters
* [start] cart, api for rfq and opp
* rfq working
* [wip] keys
* wip quotes
* [hub] register/unregister
* [hub] rename password to access_token, remove passed company field
* [hub] publishing cases, api call wrapper
* [hub] add and remove fields working
* [hub] fix flags, update on client save working
* [hub] new hub page, client item CUD at hub working
* listing, standard rate, local site hack
* item listing, item page, search, back to home
* [hub] implement hub company
* [hub] company filter
* [hub] basic rfq-ing, item page cleanup
* categories wip
* [hub] use get_doc_before_save()
* [hub] send opportunity message to hub, api to make locally
* [hub] enqueueing in hub api request wrapper
* cleanup
* [hub] refactor shopping cart's product.py to reuse
* sync dynamic item fields daily
* Scheduler heartbeat check
* [wip] hub categories
* [hub] wip enqueued callbacks
* [hub] outgoing messages, fixing callback loop
* [hub] bug: callback save after primary save
* [hub] pricing, stock, currency
* [hub] replace send_hub_request with make_and_enqueue
* add hub.less, refactor code
* Remove template html files, add styling for hub item cards
* fix paging
* add breadcrumb
* Add sidebar
* [hub] add company page, change country
* [hub] order_by filters
* [hub] make hub category a tree
* [hub] enqueue batched item enqueueing
* [hub] requested products page
* [minor]
* update hub url
* [fix] url
* [fix] more reform
* fix recursion
* [hub] data migration plans as jsons
* Hub register, create data connector, sync with run
* [add] user registration by session user
* Removed hub_message
* Remove sync code from hub_settings
* Remove hub methods from item.py
* Update Hub Sync plan
* Hub unregister
* Update Hub connector on reregister
* Dont delete Hub Connector on unregister
* Enable hub on success response
* Add new hub whitelisted methods
* [hub] list working
* Hub register from hub page
* [hub] Add hub logo in desk icon, link to page
* [hub] hide page head on empty state
* [hub] make rfq
* [hub] push opportunity doc, poll for opportunity docs
* add fields to item mapping
* update hub mappings
* Make RFQ
* [hub] item, home routing
* Make rfq and send opportunity refactor
* [hub][fix] remote lead data
* images passed as base64
* set default company on register
* Revert "images passed as base64"
This reverts commit 0b033a5fb7072b2d39a1b87a47dc41e7af707bb4.
* Add sync to hub page
* Prompt for publish items to hub
* add post process to hub document to lead
* Rename Hub document to Hub message, create opportunity in post process
2017-10-05 11:17:30 +05:30
Nabin Hait
b290e3a4e7
bumped to version 9.1.0
2017-10-04 18:51:34 +06:00
Nabin Hait
fc712aea32
Merge branch 'master' into develop
2017-10-04 18:05:20 +05:30
Nabin Hait
54c725dcd1
bumped to version 9.0.9
2017-10-04 18:35:19 +06:00
rohitwaghchaure
1e2c554e61
[Fix] Stock entry multi uom batch validation issue ( #11049 )
2017-10-04 17:52:49 +05:30
tundebabzy
65dfd09947
fix wrong variable name ( #11050 )
2017-10-04 17:51:44 +05:30
Javier Wong
61287e3c53
[fix] Change Sample Item Error Message to Zero Valuation Rate ( #10935 )
...
Change Sample Item Error Message to Zero Valuation Rate
2017-10-04 16:01:34 +05:30
Makarand Bauskar
1b67d71139
[minor] add the Lead in email account -> append_to field ( #10983 )
2017-10-04 15:55:56 +05:30
Doridel Cahanap
32456b0f14
[minor edits] BOM Stock Report ( #11012 )
...
* HTML for BOM Stock Report to show filters in PDF
* Added BOM Stock Report in Manufacturing Config under Report
2017-10-04 15:54:44 +05:30
Nabin Hait
3d0d4b2157
update subscription period only if relevant date field exists ( #11046 )
2017-10-04 15:51:55 +05:30
Nabin Hait
7e5a9f5c0e
Update new bom rate while replacing BOM ( #11045 )
2017-10-04 15:51:34 +05:30
KanchanChauhan
d3e21fff66
[Minor] Employee name as standard filter ( #11043 )
2017-10-04 15:20:34 +05:30
Nabin Hait
b779644493
Merge branch 'master' into develop
2017-10-04 14:52:32 +05:30
Nabin Hait
c83e793ce8
bumped to version 9.0.8
2017-10-04 15:22:31 +06:00
Revant Nandgaonkar
4d68e03a97
[Fix] Job Opening Web Form breadcrumb ( #11029 )
2017-10-04 14:35:21 +05:30
Makarand Bauskar
eaec4695f7
[hotfix] filter doctype if the doctype has subscription field ( #11038 )
2017-10-04 14:34:45 +05:30
rohitwaghchaure
5049edb494
[Fix] Discount and serial no search issue ( #11040 )
2017-10-04 14:33:12 +05:30
Makarand Bauskar
d17bea0a31
[hotfix] check minimum actual start time and actual end time before updating PO Operations ( #11041 )
...
* [hotfix] check minimum actual start time and actual end time before updating PO Operations
* Update production_order.py
2017-10-04 14:30:12 +05:30
Saurabh
ee4a2dd26f
[fix] resolved merge conflicts
2017-10-03 18:02:09 +05:30
Saurabh
e3a468ed1b
bumped to version 9.0.7
2017-10-03 18:30:31 +06:00
rohitwaghchaure
9e6f2a49e8
Merge pull request #11033 from rohitwaghchaure/subscription_next_data_fix
...
[Fix] Subscription next schedule date, cancel issue, added from and to date
2017-10-03 17:48:53 +05:30
Rohit Waghchaure
445e8a2e57
[Fix] Subscription end date, cancel issue, added from and to date
2017-10-03 17:45:11 +05:30
tunde
19e63b73ed
Merge branch 'develop' into payment-terms
2017-10-03 12:02:38 +01:00
Nabin Hait
7b6eaee05b
Fixes to handle async events ( #11018 )
...
* Fixes to handle async events
* transaction.js code cleanup
* Don't map taxes and charges while making PO from SO for drop-ship
* Removed print
2017-10-03 01:09:46 +05:30
Rohit Waghchaure
c4e52e5f95
[Fix] Old invoice payment amount showing in the payment modal while making payment
2017-10-02 21:20:54 +05:30
Nabin Hait
7eba1a35d3
Controller init args fix ( #11015 )
...
* Controller init args fix
* cleanup useless code
2017-10-02 15:59:27 +05:30
Nabin Hait
1f10d693e9
Don't set currency as company currency if default currency is different ( #11011 )
2017-10-02 13:20:51 +05:30
Nabin Hait
8919669ac2
Merge branch 'master' into develop
2017-10-02 12:28:27 +05:30
Nabin Hait
3a2834c7ad
bumped to version 9.0.6
2017-10-02 12:58:26 +06:00
rohitwaghchaure
88491715e0
[Fix] select batch not displaying in the modal, duplicate invoice making after sync ( #11005 )
2017-10-02 12:13:36 +05:30
Nabin Hait
f059e7be35
Merge branch 'master' into develop
2017-10-02 12:09:00 +05:30
Nabin Hait
def308a433
bumped to version 9.0.5
2017-10-02 12:38:59 +06:00
Makarand Bauskar
cb38e599e5
[minor] don't create lead if customer contact is already created against contact_email ( #10976 )
...
* [minor] don't create lead if customer contact is already created against contact_email
* [tests] added tests cases for opportunity to check if lead is required or not
2017-10-02 11:40:43 +05:30
Nabin Hait
9b98d7fa14
Gst doctype roles ( #10984 )
...
* Removed default permission from GST doctypes
* default permission from GST doctypes
2017-10-02 11:38:40 +05:30
Makarand Bauskar
b1bf502119
[hotfix] validate company name on 'The Brand' Slide instead of 'Your Organization' ( #11007 )
2017-10-02 11:38:03 +05:30
Nabin Hait
cb48404bd2
Revert "Fixes for uom in get_item_details ( #10986 )" ( #11009 )
...
This reverts commit 5b58e489a8
2017-10-02 11:37:18 +05:30
Nabin Hait
5b58e489a8
Fixes for uom in get_item_details ( #10986 )
2017-10-02 11:36:10 +05:30
Sunny
38647ed832
move Purchase Order patch to v9
2017-10-02 11:37:48 +08:00
Sunny
42c74a6365
set schedule_date when creating po
2017-10-02 11:37:48 +08:00
Sunny
c6f25ba996
correct field name
2017-10-02 11:37:47 +08:00
Sunny
b387b3cca0
[fix] tests
2017-10-02 11:37:47 +08:00
Sunny
a456901e9f
[fix] Codacy errors
2017-10-02 11:37:47 +08:00
Sunny
0f2b21f88b
Add Purchase Order schedule_date field, similar to delivery_date in Sales Order
2017-10-02 11:37:47 +08:00
Sunny
73f4eef40f
[fix] tests
2017-10-02 11:37:47 +08:00
Sunny
9ded8a7290
[fix] Codacy errors
2017-10-02 11:37:47 +08:00
Sunny
c2befc59d1
Add Purchase Order schedule_date field, similar to delivery_date in Sales Order
2017-10-02 11:37:47 +08:00
Sunny
34a8fb4100
[fix] Codacy errors
2017-10-02 11:37:47 +08:00
Sunny
47eac28f0a
Add Purchase Order schedule_date field, similar to delivery_date in Sales Order
2017-10-02 11:37:47 +08:00
Sunny
869b878286
set schedule_Date when creating po
2017-10-02 11:36:24 +08:00
Sunny
f2e2e23b6b
[fix] tests
2017-10-02 11:35:33 +08:00
Sunny
3a22fd1535
Add schedule_date when creating Purchase Order
2017-10-02 11:35:33 +08:00
Sunny
f07e53b7a8
[fix] tests
2017-10-02 11:35:33 +08:00
Sunny
bd121486a8
[fix] Codacy errors
2017-10-02 11:35:33 +08:00
Sunny
122981d465
Add Purchase Order schedule_date field, similar to delivery_date in Sales Order
2017-10-02 11:35:33 +08:00
Sunny
962cef470a
Set PO Reqd By Date default in code, to next date
2017-10-02 11:35:33 +08:00
Sunny
0f73f90fa2
[fix] Codacy errors
2017-10-02 11:35:33 +08:00
Sunny
69e88ffa39
Add Purchase Order schedule_date field, similar to delivery_date in Sales Order
2017-10-02 11:35:33 +08:00
schilgod
f29969a5cc
update test records
2017-10-02 11:35:32 +08:00
Sunny
e3ed8b7cb3
[fix] tests
2017-10-02 11:35:32 +08:00
Sunny
9626ed79fa
Add patch to update schedule date of submitted Purchase Orders
2017-10-02 11:35:32 +08:00
Sunny
c429a6e688
[fix] Codacy errors
2017-10-02 11:35:32 +08:00
Sunny
2315a79b5f
Add Purchase Order schedule_date field, similar to delivery_date in Sales Order
2017-10-02 11:35:32 +08:00
Sunny
9da25f568d
Set PO Reqd By Date default in code, to next date
2017-10-02 11:35:32 +08:00
Sunny
9d497a984b
[fix] Codacy errors
2017-10-02 11:35:32 +08:00
Sunny
bb03ec103b
Add Purchase Order schedule_date field, similar to delivery_date in Sales Order
2017-10-02 11:35:32 +08:00
Helkyd
4c58588d25
Improve Salary Register
...
Check if fieldname is a number to format.
Start the Html Salary with hidden fields and check if they not empty and increase the width...
This will remove Blank fields from the report.
2017-10-01 20:20:57 +01:00
Rushabh Mehta
4b99fe15cc
[version] 9.x.x-develop
2017-09-30 11:41:26 +05:30
Rushabh Mehta
b9fe14631d
[fix] healthcare setup
2017-09-30 10:46:56 +05:30
Nabin Hait
01b96a0e31
Fixes for uom in get_item_details
2017-09-29 18:57:41 +05:30
Nabin Hait
79a1d2a3b0
Fixes for uom in get_item_details
2017-09-29 18:15:40 +05:30
tunde
c49e748c85
Merge branch 'develop' into payment-terms
2017-09-29 13:30:22 +01:00
Nabin Hait
f65e55064b
Fixed ui tests for production order
2017-09-29 12:50:37 +01:00
Nabin Hait
6488645d42
Fixed ui tests for production order
2017-09-29 16:38:28 +05:30
Rushabh Mehta
912ae24ca2
Merge branch 'master' into develop
2017-09-29 16:22:02 +05:30
Rushabh Mehta
e1a4b3e4bc
bumped to version 9.0.4
2017-09-29 16:52:01 +06:00
Faris Ansari
8ac56b26e0
[Enhancement] Allow Multiple users in POS Profile
2017-09-29 16:15:15 +05:30
Rushabh Mehta
d3a48a83fd
[fix] bom.py, dont use keyword
2017-09-29 15:50:17 +05:30
Rushabh Mehta
80d24f83f8
[fix] item variant description
2017-09-29 15:39:03 +05:30
Pawan Mehta
5d8fd477bd
[fix] #10840 ( #10844 )
2017-09-29 15:23:54 +05:30
Javier Wong
bf37995745
[Enhancement] Sales and Purchase Default UOM ( #10929 )
...
Option for specifying an optional default Sales and Purchase UOM at the item master level.
2017-09-29 15:23:08 +05:30
tundebabzy
5510d0751d
correctly set frm company currency ( #10944 )
2017-09-29 15:21:59 +05:30
Shreya Shah
b79c4a9ff6
Getting last purchase price of an item ( #10897 )
...
* Added a column last purchase rate
* Removed button last purchase rate
* Get last purchase rate on adding an item
* Added test case for last purchase rate
* Replaced cur_frm with frm
* Update purchase_order.js
2017-09-29 15:20:48 +05:30
Francisco Roldán
1b61dfd9ea
translated ( #10886 )
2017-09-29 15:19:12 +05:30
Shridhar Patil
3f7d96ecba
Unassign from todo. ( #10896 )
...
Unassign from todo when the status is changed to Closed or Cancelled
2017-09-29 15:18:43 +05:30
Faris Ansari
367b90e3ae
Add Data Import Tool desktop icon ( #10916 )
...
fixes #8332
2017-09-29 15:17:48 +05:30
tunde
25275077ab
Merge branch 'develop' into payment-terms
2017-09-29 10:47:01 +01:00
Nabin Hait
945f502748
Fixes for updating item variant from template ( #10975 )
...
* Fixes for updating item variant from template
* More fixes for test cases
2017-09-29 15:11:50 +05:30
Makarand Bauskar
9c339145b2
[Enhance] Custom notification messages for subscription documents ( #10970 )
...
* [minor] configurable subscription email message and subject for notification
* [minor] added description for subject field
2017-09-29 15:02:51 +05:30
tunde
3415ac6e9c
Merge branch 'develop' into payment-terms
2017-09-29 10:10:24 +01:00
Rushabh Mehta
3c14c5a16c
[fix] tax_rule.py args
2017-09-29 13:21:22 +05:30
Nabin Hait
bdb4c542e7
default permission from GST doctypes
2017-09-29 10:39:32 +05:30
Nabin Hait
6d61a45f42
Removed default permission from GST doctypes
2017-09-29 10:35:21 +05:30
Nabin Hait
c314485d55
Fixes based on test case
2017-09-28 18:55:49 +05:30
Nabin Hait
3b04cfc812
minor fix
2017-09-28 18:55:49 +05:30
tunde
131f0104b0
fix production order ui test
2017-09-28 14:08:25 +01:00
tunde
18764a12c4
increase point-of-sale timeout to fix UI test
2017-09-28 11:47:27 +01:00
rohitwaghchaure
0dc3c1b114
Merge pull request #10953 from rohitwaghchaure/has_batch_item_in_demo
...
[minor] Added batch item in the demo data
2017-09-28 16:07:01 +05:30
schilgod
0f6fff6f0c
item price track_changes default to 1 ( #10958 )
2017-09-28 15:28:59 +05:30
Rushabh Mehta
2b87d100fa
[fix] https://github.com/frappe/erpnext/issues/10956
2017-09-28 15:21:36 +05:30
Rohit Waghchaure
c4ee77a3cc
[minor] Added batch item in the demo data
2017-09-28 15:19:26 +05:30
tunde
d348c12bdb
fix sales order ui test
2017-09-28 09:46:31 +01:00
Sunny
3ec6960478
move Material Request patch to v9
2017-09-28 15:26:20 +08:00
Sunny
33670bba47
fix reorder_item
2017-09-28 15:24:11 +08:00
Sunny
73f1c93cd2
fix ppt code
2017-09-28 15:24:11 +08:00
Sunny
bf68611567
clean code
2017-09-28 15:24:11 +08:00
Sunny
0d91d3f572
add schedule_date while creating Material Request
2017-09-28 15:23:52 +08:00
Sunny
892ec599d4
[fix] tests
2017-09-28 15:23:09 +08:00
Sunny
65cd9f2284
Add patch to update schedule date of submitted Purchase Orders
2017-09-28 15:23:09 +08:00
Sunny
799d69baba
[fix] Codacy errors
2017-09-28 15:22:49 +08:00
Sunny
71866e06f3
Add Purchase Order schedule_date field, similar to delivery_date in Sales Order
2017-09-28 15:22:49 +08:00
Sunny
284ceb7abe
Set PO Reqd By Date default in code, to next date
2017-09-28 15:22:49 +08:00
Sunny
65c7a6947a
[fix] Codacy errors
2017-09-28 15:22:49 +08:00
Sunny
f7a8277d12
Add Purchase Order schedule_date field, similar to delivery_date in Sales Order
2017-09-28 15:22:49 +08:00
Sunny
12cb07ce3c
[fix] test records
2017-09-28 15:22:49 +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
Nabin Hait
ca916a73de
bumped to version 9.0.3
2017-09-28 13:00:48 +06:00
Makarand Bauskar
53e19075d1
[hotfix] fixes and refactored Quoted Item Comparison report ( #10954 )
2017-09-28 12:30:04 +05:30
Rushabh Mehta
a0ba5594f9
[fix] production_order.py via error report
2017-09-28 11:26:24 +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
rohitwaghchaure
94799a8b93
[fix] ‘NoneType’ object is not iterable onload of POS ( #10941 )
2017-09-28 10:56:27 +05:30
Nabin Hait
fce14fdcf0
Fixed merge conflict
2017-09-27 17:21:21 +05:30
Nabin Hait
76615c8001
bumped to version 9.0.2
2017-09-27 17:49:55 +06:00
Prateeksha Singh
283922daa2
[fix] Check for stock_qty, else use qty ( #10937 )
2017-09-27 17:12:28 +05:30
rohitwaghchaure
da8de2f0c7
Re-order patch sequence ( #10936 )
2017-09-27 17:11:40 +05:30
Rohit Waghchaure
566a0a05c8
[fix] 'NoneType' object is not iterable while saving quotation
2017-09-27 15:57:48 +05:30
Rushabh Mehta
f702d72c35
[minor] [performance] push hsn code creation after setup ( #10928 )
2017-09-27 15:31:30 +05:30
Nabin Hait
76e1ca35ad
Merge branch 'master' into develop
2017-09-27 13:05:21 +05:30
Nabin Hait
eb686f8b1a
bumped to version 9.0.1
2017-09-27 13:35:20 +06:00
Brown-Harry Boma
d3fa19143d
Properly redirect supplier after quotations submit ( #10903 )
2017-09-27 12:53:38 +05:30
Makarand Bauskar
70eaf2da95
[minor] removed the default precision for the margin_rate_or_amount field ( #10923 )
2017-09-27 12:49:16 +05:30
Rohit Waghchaure
87e994e0a2
[fixed] Disocunt amount not working for POS
2017-09-27 12:16:58 +05:30
rohitwaghchaure
45d45f4247
[hotfix] Wrong calculation of total in taxes and totals ( #10924 )
2017-09-27 11:49:13 +05:30
Prateeksha Singh
946e182564
install company fixtures while creating company ( #10904 )
...
* install company fixtures while creating company
* [fix] remove from setup_complete
2017-09-27 11:44:39 +05:30
tunde
567119170e
Merge branch 'develop' into payment-terms
2017-09-26 17:28:07 +01:00
Frappe PR Bot
9aff73d156
[Translation] Updated Translations ( #10901 )
2017-09-26 17:18:42 +05:30
Prateeksha Singh
df8fbd7d72
[fix] batch qty checked against stock_qty field ( #10906 )
2017-09-26 17:16:03 +05:30
Nabin Hait
51a07d19c8
Merge branch 'master' into develop
2017-09-26 15:59:15 +05:30
Nabin Hait
c0b4f0e81b
bumped to version 9.0.0
2017-09-26 16:29:12 +06:00
Nabin Hait
b0ba55e52f
Set bill no while making payment entry from purchase invoice
2017-09-26 15:56:58 +05:30
tunde
79f9a4aef1
bug fix: sales invoice always dirty even after reloading
2017-09-26 10:39:30 +01:00
tunde
095cfc9cfc
disable some Payment Schedule fields
2017-09-26 10:25:49 +01:00
tunde
9e4dcdfbc8
rename Payment Terms Schedule section break to Payment Terms
2017-09-26 09:44:23 +01:00
rohitwaghchaure
d4c2d77bba
[fix] POS not working if user clicks on back button from form view ( #10912 )
2017-09-26 13:27:06 +05:30
Prateeksha Singh
ada8ba96b3
[setup] remove translations from action name ( #10911 )
2017-09-26 13:07:24 +05:30
Nabin Hait
773e686fb1
change log for version 9
2017-09-26 12:41:43 +05:30
tunde
192587fe56
UI test cases
2017-09-26 01:32:08 +01:00
tunde
c4b0d17c08
fix bug: can't make PE for invoice with multi due date
2017-09-26 01:02:43 +01:00
tunde
31ddbe36c0
fix bug: cast to flt
2017-09-25 23:24:32 +01:00
tunde
541d3f9567
fix ui tests
2017-09-25 18:15:47 +01:00
tunde
cd9bc6f795
fix failing test
2017-09-25 14:51:21 +01:00
tunde
94c3c13ba6
fix failing tests
2017-09-25 14:47:48 +01:00
Nabin Hait
afe9eabd3c
Merge branch 'master' into develop
2017-09-25 16:36:47 +05:30
Nabin Hait
360c1efd18
Merge branch 'master' into staging
2017-09-25 16:36:47 +05:30
Nabin Hait
9ef023b10f
bumped to version 8.11.6
2017-09-25 17:06:44 +06:00
Nabin Hait
0d0811ca14
reload print style
2017-09-25 16:33:45 +05:30
Nabin Hait
39c2f75e6d
Merge branch 'master' into staging
2017-09-25 16:03:32 +05:30
Nabin Hait
cb5e1e550f
Merge branch 'master' into develop
2017-09-25 16:03:31 +05:30
Nabin Hait
7da3c46ef2
bumped to version 8.11.5
2017-09-25 16:33:29 +06:00
tunde
90e09d4e79
fix failing tests from shopping cart
2017-09-25 11:27:32 +01:00
tunde
8a53b64ac4
Merge branch 'develop' into payment-terms
2017-09-25 10:31:42 +01:00
tunde
9bed2de726
show all duplicate rows after checking for duplicate due date
2017-09-25 10:19:35 +01:00
tunde
e52bb825ec
fix bug: form is always dirty
2017-09-25 09:02:23 +01:00
Nabin Hait
3b61552836
Revert "Advance against expense claim ( #10632 )" ( #10877 )
...
This reverts commit cdd6ded790
2017-09-25 11:27:39 +05:30
Nabin Hait
4ebac3380d
reload print style
2017-09-23 15:50:39 +05:30
tunde
77ecacc379
validation to check for possible duplicate payment terms
2017-09-22 23:12:55 +01:00
tunde
cf42d1db5c
more tests
2017-09-22 17:20:33 +01:00
tunde
3aec78b472
make due date, invoice_portion mandatory
2017-09-22 16:22:15 +01:00
tunde
e6b3fe1215
add tests for payment term template
2017-09-22 16:04:07 +01:00
tunde
d6cf6fb124
documentation for payment terms
2017-09-22 15:49:02 +01:00
tunde
62af5c5693
more validation checks and test fixes
2017-09-22 15:16:38 +01:00
tunde
73a83a472d
validation for Payment Terms Template
2017-09-22 11:05:40 +01:00
tunde
25cda29007
fix test Employee
2017-09-21 14:33:39 +01:00
tundebabzy
e4be3f8dc9
use generator when updating and notify user of long process ( #10777 )
2017-09-21 18:27:33 +05:30
tunde
d7d306bfdb
fix final failing test
2017-09-21 13:43:38 +01:00
Nabin Hait
cdd6ded790
Advance against expense claim ( #10632 )
...
* Adds Whitelist Method for Advance Entry
* Adds changes required for managing Advance Payments in Expense Claim including new fields and documentation. Also resolved merge conflict by using the more recent modified date
* Adds changes for managing advance payments using Default Account and Party
* Removed console.log from the JS file
* Advance Payment Patch - Fixed Codacy errors
* Removed stray file
* Fixed conflicts due to changes in upstream
* Fixed Codacy errors
* Fixed Codacy errors
* Fixed Codacy errors
* Fixed Codacy errors
* Fixed Codacy errors
* Fixed pending Codacy error
* Updated JS code by removing cur_frm which is soon to be deprecated
* Advance against Expense Claim: cleanup and fixes
* Test case fixed
2017-09-21 18:03:45 +05:30
Nabin Hait
3d5d858933
set total in tax table if category not valuation and consider deductions ( #10870 )
2017-09-21 16:15:30 +05:30
Nabin Hait
6d78f7b862
Fixed indentation
2017-09-21 15:51:42 +05:30
tunde
82de375ba0
Merge branch 'develop' into payment-terms
2017-09-21 11:21:05 +01:00
Nabin Hait
5478a7fa67
Merge branch 'develop' of https://github.com/AravindPranera/erpnext-1 into AravindPranera-develop
2017-09-21 15:48:18 +05:30
tunde
951092eecd
fix sales order and pricing rule failing tests
2017-09-21 11:14:53 +01:00
Nabin Hait
2851dfad99
Set fields in Item Variant Settings which should be copied from template to variant
2017-09-21 15:41:57 +05:30
Rohit Waghchaure
5b05335e89
added patch and set default fields after completion of setup wizard
2017-09-21 15:41:57 +05:30
Rohit Waghchaure
0e28fccb34
[Enahance] Update variants fields defined in the Item Varianst Settings, if template updated
2017-09-21 15:41:57 +05:30
tunde
99849f8eab
fix failing tests
2017-09-21 10:23:40 +01:00
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
rohitwaghchaure
12fd8a6047
[fix] User not able to complete the production order because of decimal issue ( #10868 )
2017-09-21 14:39:10 +05:30
Nabin Hait
24ec3c7dcb
Fixed merge conflict
2017-09-21 12:53:41 +05:30
tunde
ae0eb718a3
Merge branch 'develop' into payment-terms
2017-09-21 08:12:23 +01:00
Prateeksha Singh
705d885b64
[progress] R/W permission for all roles ( #10866 )
2017-09-21 12:02:18 +05:30
Manas Solanki
1c1dd08a34
only validate party account and ref doc party account in selected case ( #10863 )
...
* only validate party account and ref doc party account in selected case
* fix for fee structure test
* fix the assessment result test
2017-09-21 12:01:20 +05:30
tunde
c02f332565
Merge branch 'develop' into payment-terms
2017-09-20 15:37:34 +01:00
tunde
35c84fe4f2
fix failing test case
2017-09-20 12:26:19 +01:00
Nabin Hait
b2dca79d89
Updated modified timestamp in sales/purchase transaction doctypes
2017-09-20 09:56:06 +05:30
tunde
4712ed6377
remove logging statement
2017-09-19 21:30:34 +01:00
tunde
3387d026b1
Merge branch 'develop' into payment-terms
2017-09-19 18:07:12 +01:00
tunde
da17954919
fix failing tests
2017-09-19 17:53:31 +01:00
Nabin Hait
6960a76adc
Fixes related to schools fees
2017-09-19 17:23:03 +05:30
Manas Solanki
0664d6ed8b
real time fee creation status via socketio
2017-09-19 17:23:03 +05:30
Manas Solanki
1bcc6c661a
minor changes
2017-09-19 17:23:03 +05:30
Manas Solanki
9b44c16a32
add the fee schedule in config
2017-09-19 17:23:03 +05:30
Manas Solanki
1299d56e85
cleanup of the fee module
2017-09-19 17:23:03 +05:30
Manas Solanki
8c88af23ef
added the test case for the fees
2017-09-19 17:23:03 +05:30
Manas Solanki
d1d2633658
removed the fee schedule
2017-09-19 17:23:03 +05:30
Manas Solanki
152ba1eccb
fixes as per the review
2017-09-19 17:23:03 +05:30
Manas Solanki
49c52f7639
renamed one doctype to the fee schedule
2017-09-19 17:23:03 +05:30
Manas Solanki
4e0559bc79
make payment entry for the fees
2017-09-19 17:23:03 +05:30
Manas Solanki
2b39d5d6d5
make gl_entry on submission of fees
2017-09-19 17:23:02 +05:30
Manas Solanki
e4acf763a5
make payment request for the fee
2017-09-19 17:23:02 +05:30
Manas Solanki
f073814635
added fee request doctype
2017-09-19 17:23:02 +05:30
Nabin Hait
2e4de83df6
Rounding Adjustment via a separate field, instead of last tax row ( #10659 )
...
* Rounding Adjust via a separate field, instead of last tax row
* Fixed test cases
2017-09-19 14:53:16 +05:30
Rohit Waghchaure
c15a3bd379
[fix] Subscription patch broken if reference document has been cancelled
2017-09-19 12:53:11 +05:30
Nabin Hait
caf9891075
Fixed merge conflict
2017-09-19 12:06:22 +05:30
Nabin Hait
bd4b80e3d8
Merge branch 'master' into develop
2017-09-19 12:05:41 +05:30
Nabin Hait
703e837125
bumped to version 8.11.4
2017-09-19 12:35:39 +06:00
rohitwaghchaure
4f0f144142
Merge pull request #10831 from rohitwaghchaure/cherry_pick_subscription_staging_to_develop
...
Cherry pick staging to develop for subscription cleanup
2017-09-19 10:26:20 +05:30
Nabin Hait
cf36534eed
Gross profit report considering returned items ( #10734 )
2017-09-18 19:13:45 +05:30
AravindPranera
cb6774e373
Files added with all functions
2017-09-18 17:37:37 +05:30
AravindPranera
1276893550
Files added with all functions
2017-09-18 17:30:20 +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
Nabin Hait
e859671eb3
Revert "Added ability to disable auto creation of Sales Invoice when customer pays a payment request ( #10706 )" ( #10830 )
...
This reverts commit d258372f9e
2017-09-18 17:22:46 +05:30
Neil Trini Lasrado
d258372f9e
Added ability to disable auto creation of Sales Invoice when customer pays a payment request ( #10706 )
2017-09-18 17:12:16 +05:30
tundebabzy
f6d738b3c5
Delivery note to billing issue ( #10726 ) ( #10766 )
...
* allow invoices to be made from sales returns
* Update queries.py
2017-09-18 17:10:09 +05:30
Utkarsh Goswami
b98359f4a7
Payment entry ( #10668 )
2017-09-18 17:06:13 +05:30
Makarand Bauskar
5c1d15f015
[change-log] added change log for v9.0.0 ( #10756 )
...
* [change-log] added change log for v9.0.0
* Update v9_0_0.md
2017-09-18 17:03:21 +05:30
Manas Solanki
a22c94c246
refactored assessment result tool ( #10633 )
...
* save the assessment instead of submit
* Added comments in the artool
* remove the cur_frm and message for submitted result
* link field for the assessment result
2017-09-18 16:59:54 +05:30
Faris Ansari
aebcb17daf
Show thumbnail image in daily work summary ( #10605 )
...
* Show thumbnail image in daily work summary
* Crop thumbnail image into square
* fix codacy
2017-09-18 16:58:24 +05:30
rohitwaghchaure
6cea73b834
[fix] Subscription patch ( #10827 )
2017-09-18 16:58:05 +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
Neil Trini Lasrado
de3429280b
Made Template link in variant (Item Master) intro linkable ( #10696 )
...
* Made Template link in variant (Item Master) intro linkable
* Update item.js
2017-09-18 16:42:10 +05:30
Neil Trini Lasrado
8c9f2a1be6
Add communication entry to Sales Order only if payment entry email is sent to customer ( #10716 )
2017-09-18 16:41:49 +05:30
Prateeksha Singh
9b4f3cf9de
Leaderboard cleanup ( #10638 )
...
* [leaderboard] wip
* [leaderboard] filter for selecting leaderboard criteria, single col
* [leaderboard] doctypes in sidebar
* hide graph if no results
2017-09-18 16:41:04 +05:30
tunde
9448f4b13c
codacy corrections
2017-09-18 12:08:34 +01:00
tunde
4bf3ed47ff
revert from trying to adjust payment schedule based on old recurring_document
2017-09-18 11:54:28 +01:00
Saurabh
9c334c34a6
[fix]remove employee field from tab salary structure
2017-09-18 16:17:13 +05:30
Manas Solanki
e716da04ec
add the newsletter in the standard portel ( #10784 )
2017-09-18 16:00:34 +05:30
Saurabh
590d401e5f
[fix] if bom specified on purchase order item then don't pull default bom in purchase receipt ( #10793 )
...
* [fix] if bom specified on purchase order item then don't pull default bom in purchase receipt
* Update bom.js
* Update stock_entry.py
2017-09-18 15:49:19 +05:30
ci2014
9bc197cfd5
Update project.js ( #10796 )
...
* Update project.js
Move indicators to setup to be less buggy
* fixed codecy trailing whitespace issues
2017-09-18 15:44:36 +05:30
Saurabh
d7e1869a70
[fix] if item code not exists then exclude item in validate_selling_price ( #10800 )
2017-09-18 15:43:35 +05:30
Saurabh
3f15bf9828
[fix] query fix for match conditions ( #10810 )
2017-09-18 15:27:24 +05:30
Nabin Hait
9744aa21af
Minor fix in tax rule
2017-09-18 15:25:33 +05:30
Adam Dawoodjee
91eda6dad4
Update creating-custom-link-field.md ( #10822 )
...
Grammer improvements
2017-09-18 15:11:57 +05:30
Zarrar
8f957ef6e6
fetching data from last route ( #10816 )
2017-09-18 15:11:20 +05:30
Utkarsh Goswami
11bd5fc3b1
Description moved next to item code ( #10820 )
2017-09-18 15:05:50 +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
rohitwaghchaure
70ef09aa8f
Merge pull request #10809 from rohitwaghchaure/fixed_test_cases_issue
...
[fix] Test cases for tax rule
2017-09-16 22:55:16 +05:30
Rohit Waghchaure
2cb2064c6f
Fixed test cases tax rule
2017-09-15 23:10:27 +05:30
Nabin Hait
21617da619
More fixes for UI tests
2017-09-15 21:22:16 +05:30
Nabin Hait
628ca2a2ec
Minor fix for ui tests
2017-09-15 19:35:12 +05:30
Nabin Hait
46941e8b35
Time out increased for appraisal template
2017-09-15 18:56:49 +05:30
Prateeksha Singh
d1ce7bfff4
[fix] set item valuation rates ( #10681 )
2017-09-15 16:17:29 +05:30
rohitwaghchaure
dd092e30fb
Move subscription module to accounts ( #10772 )
2017-09-15 16:16:36 +05:30
Makarand Bauskar
5ac01a2bf7
[minor] translate the action name in get_slide_settings ( #10740 ) ( #10790 )
2017-09-15 12:10:29 +05:30
AravindPranera
27bbb561d2
removed whitespace
2017-09-15 11:04:14 +05:30
AravindPranera
2c1f44ecfa
Trailing space removed in line 275
2017-09-15 10:57:23 +05:30
AravindPranera
c73383c34c
Trailing whitespace in Line 207 and 276
2017-09-15 10:34:21 +05:30
Nabin Hait
43268bd350
Fixed salary structure tests
2017-09-14 19:39:10 +05:30
Nabin Hait
2f64f0f5fa
Fixed salary structure tests
2017-09-14 19:08:15 +05:30
Nabin Hait
427172c941
Update test_salary_structure.js
2017-09-14 17:57:21 +05:30
Nabin Hait
41146657de
Set default customer group and territory after install
2017-09-14 17:26:23 +05:30
Nabin Hait
092f6d3739
Fixes ui tests
2017-09-14 16:45:47 +05:30
mbauskar
f41cff27e6
resolved merge conflicts
2017-09-14 15:32:55 +05:30
mbauskar
ea832b8157
resolved merge conflicts
2017-09-14 15:32:10 +05:30
mbauskar
8ea3bb0d90
bumped to version 8.11.3
2017-09-14 15:58:44 +06:00
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
Nabin Hait
a6d78ef842
Added Supplier Bill Date in Itemised Purchase Register ( #10783 )
2017-09-14 15:01:04 +05:30
Nabin Hait
77b225e021
Fetch BOM items in Production Order in the same order as BOM
2017-09-14 13:22:45 +05:30
Nabin Hait
3f583b6dd2
Merge branch 'sort_bom_items' of https://github.com/creamdory/erpnext into creamdory-sort_bom_items
2017-09-14 12:59:31 +05:30
Vishal Dhayagude
d3e22ac09e
[UI Test] Modified Sales Order UI Test ( #10770 )
...
* [UI Test] Modified Sales Order UI Test
* [fix] Codacy fixed
2017-09-14 12:51:22 +05:30
Nabin Hait
f6b132f78e
Update test_quotation.js
2017-09-14 11:55:31 +05:30
Nabin Hait
c7c141a5a0
Update test_setup_wizard.py
2017-09-14 11:51:43 +05:30
rohitwaghchaure
f8458ed9e4
Merge pull request #10771 from nabinhait/pro_order_99
...
Update actual dates in Production Order from Timesheet
2017-09-14 10:53:48 +05:30
rohitwaghchaure
9a0db392de
[Fix] Only typed keywords displying in the field on selection of customer ( #10778 )
2017-09-14 10:51:21 +05:30
Nabin Hait
92309afea1
Update test_setup_wizard.py
2017-09-13 22:37:14 +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
tundebabzy
c050c6945c
show error message if cannot get accounts details ( #10768 )
2017-09-13 15:27:30 +05:30
Nabin Hait
c443c9f05d
Update actual dates in Production Order from Timesheet
2017-09-13 15:14:40 +05:30
Nabin Hait
78baebfe0d
Setup wizard test fix
2017-09-13 15:12:45 +05:30
Rushabh Mehta
f056974bc5
[domain] Healthcare ( #10664 )
...
* Medical module for erpnext
* Changes in core for Medical module
* patient registration updated
* fix - appointment invioce - fields missing
* pages- indicator instead of bg-color
* Lab Test field renamed service type
* Department added Lab Test
* procedure name in prescription
* fixes sample collection
* filter disabled patient
* fix patient admission
* updated patient age
* availability check msg updated
* fixes, removed procedure from invoice
* sample print renamed
* fixes, validation
* service desk physician in filter
* refactor scheduler
* Appointment -field property - set only once = 1
* Appointment - Mark closed and pending buttons removed
* Appointment - readonly = 1 if value set
* Appointment - availabilty
* Appointment - Cancel - info - cancel invoice
* Appointment - set pending appointments
* Dosage form - new DT
* Drug Prescription - Dosage form added
* Facility - Floor - removed from Fecility
* Floor - removed
* Lab Test Template - item creation validation
* Procedure - Create Procedure
* Procedure Appointment - new DT
* Service Unit - Floor reference removed
* Zone Fcilities - Unused DT removed
* Appointment Desk - fixed
* Service Desk - method pointing from procedure changed to procedure_appointment
* Consultation print - got featured
* Consultation - removed patient refernce to procedure prescription
* Procedure Prescription - removed patient refernce
* Lab Test - Changed field properties and value
* Lab Test - field property changed
* Lab Test - methods rewrite - lab test doc creation
* Lab Test - create lab test from invoice and consultaion - got changed
* Button History changed to Medical Record
* Service Desk - Updated
* Notification - Procedure Appointment
* fix-get procedure prescription
* fix field added to test prescription
* msgprint on invoice creation
* fix data on install
* Merge branch erpnext/develop
* fixes- minor
* Setup wizard - Create Sensitivity
* Appointment - Validate and Save if there is no schedule for Physician
* Consultation - Button create vital signs and medical record
* Review Type - New DocType
* Review Detail and Treatment Plan - Childs - Consultation
* Patient Medical Record - field Attach doc
* Consultation - New Fields
* Consultation - Manage new Fields - Medical record add action
* Patient Relation - Child DocType - Patient
* Patient - Patient Relation added
* Patient - collapsible = 1
* Laboratory Settings - fields - message for lab test
* Laboratory Settings - get message for lab test
* SMS text for lab test and invoice test report
* Procedure Stock Detail - Stock detail for Procedure and Template
* Template Stage Detail - Stage detail for Procedure Template
* Procedure Stage Detail - Stage detail for Procedure
* Service Unit - field - warehouse
* Scheduler - msg - content changed
* Laboratory Settings - defualt - msg content
* Invoice Test Report - msg print
* Print Format-Changed-Consultation-Invoice Test Report-Lab Test
* OP Settings - Expnse Account for Stock Entry in Procedure
* Procedure and Procedure Template - Manage Stock Stage and Sample Collection
* Procedure Appointment - Manage Stock and Stage
* Lab Test - fixed - resource not find
* Invoice Test Report - fixed - resource not find
* Procedure - doc reload after insert
* Patient Medical Record - fixed - refernce missed
* Create Vital Signs -on client side
* Rename module Medical to Healthcare
* Remove In Patient (IP) Feature.
* Rename - Procedure to Clinical Procedure
* Remove spaces in Naming Series
* Rename Duration to Drug Prescription Duration
* Duration to Drug Prescription Duration
* Merge All Settings to Healthcare Settings
* Healthcare settings - import fixed
* Procedure related documents are removed
* Appointment Desk and Sevrvice Desk are removed
* Consultation - minimal
* Consultation - minimal
* Consultation - minimal - patient detials in collapsible section
* Message Print to Alerts
* Patient - some fields removed
* Patient - create consultation - message print to alerts
* Consultation - show patient details updated
* Setup wizard - Duration to Drug Prescritpion Duration
* Healthcare Settings - patient registration - fee collection
* Lab Test - Create Sales Invoice bug fixed
* Healthcare menu rearranged
* Healthcare Settings - Optimised and Rearragnged
* Healthcare Settings - Expense account removed
* Receivable account removed from patient
* Patient - Optimised and Rearragnged
* Removed Referring Physician
* Healthcare Settings - bold headings removed
* Physician - Patient - Fields are Segregated
* Remove Service Unit
* Remove - Service Type
* Consultation invoice
* Lab Test - invoice
* Patient - Invoice
* Rename Appointment to Patient Appointment
* wip
* Patient Dashboard, Physician Form cleanup
* Dosage renamed to Prescription Dosage
* Renamed Drug Prescription Duration to Prescription Duration
* Patient Appointment booking modal
* Patient Age - calculate by dob
* Remove - scheduler
* Consultation - Appointment to Patient Appointment
* Patient Dashboard - rearranged
* Patient Appointment
* Removed rer_physician from lab test and consultation
* Patient Appontment Changes
* Appointment and Consultation - optimized
* Patient Appointment - fee validity code optimized
* Consultation and Patient Appointment - Invoice validate two side
* fix : #13 remove relation to admission
* Healthcare - Patient Portal
* fix import error
* domain Healthcare added on install
* Removed - Invoice Test Report
* Physician Schedule - menu
* Consultation - patient details - re write
* New Doctype-Medical Code
* Consultation - Daignosis codification
* Medical Code - Codification - Settings
* Medical Code Standard - Medical Code - Codification - Settings
* fix appointment calendar
* fix appointment analytics
* Menu Medical Code Standard
* New Doctype - Medical Code Standard
* Set Physician Role insted of IP Physician and OP Physician Role
* fixed some json files
* Medical code - permission to physician
* Unused Childs - Work Schedule and User List - Removed
* Label Procedure to Lab Test
* Lab Test and Patient - code optimised
* Add Item Groups - setup wizard
* Healthcare Settings - add Role - Medical Administrator
* Healthcare - Demo setup - Make Demo
* Fee Validity - Logic Test
* Test Fee Validity - Optimised
* Healthcare Doctypes - Restricted to Domain Healthcare
* Domainify - remove Healthcare Roles - Other Domains
* Healthcare doctypes - beta checked
* Codacy fixes
* Codacy - fixes
* Codacy - fixes
* Codacy - fixes
* Codacy - fixes
* Codacy - fixes
* Lab Test - print hide =1 for some fields
* Consultation - Codification field label to Medical Coding
* Codacy fixes - import frappe and etc.
* Codacy fixes - import frappe in test_vital_signs
* Codacy fixes
* Codacy fixes
* Codacy fixes and remove delete perm for patient
* send_sms - import form frappe
* Healthcare Settings
* Lab Prescription - Consultation - Test Code - read_only = 0
* Portal fixes
* Patient Appointment - filter physician - if has schedule
* Physician - IP Charge - Removed
* test - files
* Web Form - Patient Profile - removed
* Role Medical Administrator to Healthcare Administrator
* WIP healthcare documentation
* Coday - fixes
* Travis - fixes
* Lab Test Report - menu
* Reorder Healthcare settings - group lab config to bottom
* Sample Collection - New - allow Sample and patient Selection
* Rate - similar behaviour and Label as in Item Standard Selling Rate
* Healthcare documentation
* Lab Test Samples to Lab Test sample
* Commplaints to Complaint
* Commplaints to Complaint
* Antibiotics to Antibiotic
* Appointment Token Number - remove
* View - Medical record
* Codacy fixes
* update healthcare docs
* Cleanup Docs - Search, quick entry, trsck change, etc.
* [minor] ux changes
2017-09-13 12:52:30 +05:30
Nabin Hait
ff667695ad
timeout in setup wizard test
2017-09-13 11:26:55 +05:30
Rushabh Mehta
f849915c13
[fix] label
2017-09-13 10:48:53 +05:30
Nabin Hait
231c324589
Merge branch 'master' into staging
2017-09-12 16:26:31 +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
Nabin Hait
e47bd4f477
bumped to version 8.11.2
2017-09-12 16:46:55 +06:00
rohitwaghchaure
67dfd26639
[fix] Production planning tool, unable to download material required report ( #10704 )
2017-09-12 15:54:27 +05:30
rohitwaghchaure
54099e592e
[fix] Serial No has already been received error while making purchase receipt entry for the returned serial no ( #10736 )
2017-09-12 15:51:52 +05:30
Manas Solanki
580f39a12c
check the instructor table before querying ( #10754 )
2017-09-12 15:49:36 +05:30
Nabin Hait
c9e96c15af
Rate and amount in a single row in tax breakup
2017-09-12 15:45:49 +05:30
Nabin Hait
de9eebe51c
Fixed multiple ui tests
2017-09-12 15:40:33 +05:30
Sagar Vora
d54d6bc572
[fix] use stock_qty in reports instead of qty to match with stock_uom ( #10727 )
2017-09-12 11:31:10 +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
1a77922e85
rename Is Online field to Use POS in Offline Mode in pos settings
2017-09-12 11:01:48 +05:30
Makarand Bauskar
d0823adf42
[minor] translate the action name in get_slide_settings ( #10740 )
2017-09-12 10:52:24 +05:30
rohitwaghchaure
80b902cea6
Merge pull request #10732 from rohitwaghchaure/rename_pos_field_in_pos_settings
...
Rename Is Online field to Use POS in Offline Mode in pos settings
2017-09-11 22:36:38 +05:30
tunde
ecb118fb3b
bugfix: call set_payment_schedule only in relevant doc
2017-09-11 15:45:10 +01:00
Nabin Hait
e5716e3b1e
Default view of BOM is Listview
2017-09-11 19:21:47 +05:30
rohitwaghchaure
47605cae16
Merge pull request #10737 from nabinhait/budget_variance_for_project
...
[fix] Actual amount for budget variance report
2017-09-11 16:47:16 +05:30
Frappe PR Bot
8a803a2310
[Translation] Updated Translations ( #10741 )
2017-09-11 16:31:10 +05:30
rohitwaghchaure
e2149cb46f
Merge pull request #10697 from rohitwaghchaure/customer_search_optimization
...
[Fix] Customer search optimization for the offline POS
2017-09-11 16:23:15 +05:30
tunde
df3a175974
fix bugs: add payment_schedule if payment_terms_schedule specified
2017-09-11 11:02:57 +01:00
Nabin Hait
509bca36b1
Reverse charge in gst print format
2017-09-11 15:19:07 +05:30
Nabin Hait
cfb9310d13
Removed commit after creating custom gst fields
2017-09-11 15:00:16 +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
Nabin Hait
f5cbb9c7b9
[fix] Actual amount for budget variance report
2017-09-11 13:58:15 +05:30
mbauskar
336c9b23d6
Merge branch 'master' into staging
2017-09-10 12:32:21 +05:30
mbauskar
dfeadf876e
Merge branch 'master' into develop
2017-09-10 12:32:21 +05:30
mbauskar
438088f69d
bumped to version 8.11.1
2017-09-10 13:02:20 +06:00
Makarand Bauskar
80b2ba2b9a
[hotfix] fixed Not Permitted issue for System user while accessing documents on portal ( #10725 )
...
* [hotfix] dont allow guest user to list the invoices or orders
* [hotfix] fixed Not Permitted issue for System user while accessing documents on portal
* [codecy] removed trailing whitespace
* [fixes] added filters for supplier in RFQ and other minor fixes
2017-09-10 12:04:28 +05:30
tunde
96b8f223fd
fix failing tests
2017-09-08 15:35:59 +01:00
Faris Ansari
425f1df799
[fix] Tax area alignment ( #10690 )
2017-09-08 15:56:34 +05:30
