Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
21,593 Commits 3 Branches 0 Tags 1 GiB
c634ca8737
Commit Graph

13665 Commits

Author SHA1 Message Date
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