Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
20,729 Commits 3 Branches 0 Tags 1 GiB
344f5d9cd6
Commit Graph

832 Commits

Author SHA1 Message Date
Nabin Hait
5c18bd9b61 Fixed merge conflict 2016-12-06 16:16:58 +05:30
Rohit Waghchaure
c857f37f3a [fix] currecny symbol for customer's total annual billing, total unpaid amount 2016-12-05 17:44:06 +05:30
Nabin Hait
3f1c50a483 Merge pull request #6920 from KanchanChauhan/delivery-note-serial-no-fifo 
[Fix] Fetch Serial No by default for  Delivery Note Item
 2016-12-05 16:51:42 +05:30
Rushabh Mehta
323c06ebbf [minor] rename icons as per FontAwesome 4 (#7136) 2016-12-05 14:17:26 +05:30
Kanchan Chauhan
af0d6378f1 [Fix] Fetch Serial No by default for Delivery Note Item 2016-12-02 18:18:04 +05:30
bhupen
3c7e70ffb3 [Fix] Disallow same items to be fetched multiple times in sales invoice 2016-11-30 14:32:11 +05:30
Rohit Waghchaure
b1b328865e [Enhancement] Currency added in the BOM 2016-11-22 12:52:20 +05:30
Nabin Hait
8af429da1f Cleanup and fixes in quality inspection feature 2016-11-16 17:22:38 +05:30
Manas Solanki
dbc2511a39 [Fix] Delivery Note fixed 2016-11-16 17:22:38 +05:30
Manas Solanki
34feab1b25 [Fix] Redesign of quality inspection doctype 2016-11-16 17:22:38 +05:30
Manas Solanki
a8d1bc7ff4 [Fix] Quality Inspection in Purchase Invoice fixed 2016-11-16 17:22:38 +05:30
Manas Solanki
c2cd3fd2c6 Function in parent transaction.js and call from corresponding files 2016-11-16 17:22:38 +05:30
Manas Solanki
cc90241fa5 Quality Inspection Issue 
1. validate_inspection() function defination in stock_controller.py
2. function call in purchase_receipt.py, purchase_invoice.py and delivery_note.py
3. added functality in quality_inspection.py file for linking to purchase_receipt_no and delivery_note_no
 2016-11-16 17:22:38 +05:30
Rushabh Mehta
4bfa0748cd [merge] master 2016-11-16 11:28:23 +05:30
Rushabh Mehta
440650d4a2 [fix] view shopping cart dropdown (#6928) 2016-11-14 13:13:53 +05:30
pratu16x7
84228402e6 Update erpnext manual link (#6853) 
* Update erpnext manual link

* Update README.md

* Update conf.js
 2016-11-07 17:18:15 +05:30
Nabin Hait
eab38cd4eb Merge branch 'master' into develop 2016-11-03 15:17:39 +05:30
Nabin Hait
9f5f534900 set item rate on first selection of item 2016-11-03 14:54:06 +05:30
Rushabh Mehta
e855f53f08 [minor] fix ellipsis style 2016-11-02 07:34:17 +05:30
mbauskar
be81442c82 [minor] link formatter fixes for Item and Employee 2016-10-27 09:49:22 +05:30
Nabin Hait
72a1943c8e Fixed version conflict 2016-10-26 16:41:21 +05:30
Rohit Waghchaure
43b508089e [Fix] Pricing rule discount issue 2016-10-24 16:16:24 +05:30
Nabin Hait
395d757c5a Fixed merge conflict 2016-10-17 16:42:49 +05:30
Nabin Hait
cd9c45f816 Fixed merge conflict 2016-10-07 16:53:07 +05:30
Rohit Waghchaure
7d5298997b Documentation for payments 2016-10-06 16:49:39 +05:30
Rohit Waghchaure
b7a5502b97 [Enhancement] Option to make payment via Journal Entry 2016-10-06 12:04:52 +05:30
Nabin Hait
558f526a68 Fixed version conflict 2016-10-05 17:18:36 +05:30
Nabin Hait
6c49fa20b5 Fixed precision of rate field 2016-10-05 11:28:02 +05:30
Rushabh Mehta
aedad64445 [minor] fixes 2016-10-04 11:41:42 +05:30
Kanchan Chauhan
b40c0a917d [WIP] Process Payroll Changes 2016-09-28 15:14:41 +05:30
Nabin Hait
6b4eb7f77f Fixed version conflict 2016-09-23 12:16:31 +05:30
Rohit Waghchaure
deaee7c08b [Fix] Additional Discount Amount can't be refresh automatically #6199 2016-09-22 14:02:53 +05:30
Rushabh Mehta
559aa3ab7c [enhance] show customer, supplier billing and outstanding, fixes #6078 2016-09-19 16:04:58 +05:30
Chude Osiegbu
256ec170d0 Corrections properly distinguish between transaction_date and posting_date as the basis for determining translation date that is passed to get_exchange_rate 2016-09-19 03:53:37 +01:00
Chude Osiegbu
375a3c003d Update to erpnext/public/js/controllers/transaction.js in order to enable it detect when the doctype for which exchange rate is to be determined is a Sales Order or Purchase order. If it is either, then use transaction_date instead of posting_date as the argument to get_exchange_rate method 2016-09-19 02:35:32 +01:00
Chude Osiegbu
3c6a937a7c Merge branch 'develop' into exchange_rate_modifications 2016-09-18 21:47:55 +01:00
Rushabh Mehta
b6bca567ce [fixes] [style] for web-form 2016-09-13 14:40:13 +05:30
Rohit Waghchaure
60a05324ce POS changes and fixes 2016-09-12 13:11:10 +05:30
Chude Osiegbu
fbf27b5031 Further corrections to Currency Exchange table 2016-09-07 03:06:08 +01:00
Chude Osiegbu
7be3aa3158 Changes to allow exchange rates on a specific day to be stored in Currency Exchange and to be pulled by the necessary transactions based on the posting date. 2016-09-05 23:35:00 +01:00
Rushabh Mehta
b2f0920346 [minor] new global for query report filters 2016-09-01 17:53:42 +05:30
Nabin Hait
2490ea0b91 Fixed merge conflict 2016-09-01 12:29:31 +05:30
Rohit Waghchaure
d39f53319d Added zero value condition 2016-08-31 02:09:15 +05:30
Rohit Waghchaure
609e2b4ca3 [POS] Currency format issue 2016-08-31 02:04:53 +05:30
Rohit Waghchaure
a57bf5ee2e [fix] Precision issue for field conversion rate in POS 2016-08-30 01:05:01 +05:30
Nabin Hait
338e63c448 Fixed version conflict 2016-08-29 11:47:50 +05:30
Rohit Waghchaure
63bdd679d0 [POS] Fixes and cleanup 2016-08-27 02:53:36 +05:30
Kanchan Chauhan
dd96cbd012 Coded column deleted, column added from UI 2016-08-26 14:32:38 +05:30
Nabin Hait
0da75aede3 Fixed merge conflict 2016-08-26 12:40:02 +05:30
Rohit Waghchaure
efb5bf2cfc [POS] Fixed payment gl entry for sales return 2016-08-25 16:23:47 +05:30
Rushabh Mehta
547dff5d5b [version] 7.1-beta 2016-08-24 12:44:32 +05:30
Nabin Hait
cfbd0199eb Merge branch 'master' into develop 2016-08-23 12:10:56 +05:30
Rohit Waghchaure
ea6d7e9b09 [Fix] decimal button not working 2016-08-23 11:39:44 +05:30
Nabin Hait
26f9673ad9 Merge pull request #6126 from rohitwaghchaure/multiyear_financial_statements 
[Enhancement] Multi year financial statements
 2016-08-23 11:32:08 +05:30
Rushabh Mehta
3d93ddc606 [fix] docs links 2016-08-22 18:48:04 +05:30
Faris Ansari
3a6155b1b9 add help_links.js 2016-08-22 14:37:22 +05:30
Rohit Waghchaure
26b646f8a3 Added validation for fiscal year 2016-08-21 17:14:12 +05:30
Rohit Waghchaure
713e2b7b62 [POS] Fixed issue of paid amount, write off account 2016-08-19 19:27:16 +05:30
Rohit Waghchaure
4275c30059 [Enhancement] Multi year financial statements 2016-08-19 18:04:32 +05:30
Nabin Hait
6fe3ac49cf Merge pull request #6039 from rohitwaghchaure/allow_to_edit_change_amount 
Allow to edit change amount
 2016-08-17 17:08:54 +05:30
Rohit Waghchaure
e4e69ec027 changed field name, validation for change amount account, validation for serial no qty 2016-08-17 16:20:13 +05:30
Rushabh Mehta
185c247286 Merge pull request #6024 from rohitwaghchaure/get_account_of_payment_mode_issue 
[Fix] Get account of the mode of payment on sales invoice and pos profile
 2016-08-10 14:25:42 +05:30
Rushabh Mehta
a56121a342 Merge pull request #6034 from netchampfaris/ui-fixes 
[ui] fix thumbnail for long images in image view frappe/erpnext#1939
 2016-08-10 14:24:58 +05:30
Rohit Waghchaure
70be24d6f0 [Fix] Get account of the mode of payment on sales invoice and pos profile 2016-08-10 13:16:39 +05:30
Rohit Waghchaure
baef2624a2 Given provision to enter write off and change amount on POS 2016-08-10 00:50:53 +05:30
Rushabh Mehta
ec2d09c557 [minor] setting up website optional in setup wizard 2016-08-09 16:44:37 +05:30
Faris Ansari
d217387400 [ui] fix thumbnail for long images in image view 2016-08-09 14:15:59 +05:30
Rohit Waghchaure
7127a8f522 Allow user to edit change amount from sales invoice form for is pos 2016-08-08 23:19:18 +05:30
Nabin Hait
3bb1a421f0 Change amount calcualtion in POS if there is write off amount and gl entries in this scenario 2016-08-02 16:41:15 +05:30
Rohit Waghchaure
a88dec8775 [Fix] batch no searching in pos 2016-08-01 13:01:13 +05:30
Nabin Hait
981f6ea34e minor fix for item and employee link formatter 2016-07-31 11:44:43 +05:30
Rushabh Mehta
180e43585f [minor] formatter for item and employee 2016-07-29 18:52:00 +05:30
Nabin Hait
7bae70a993 [fix] Show supplier name field if it is different from supplier id 2016-07-28 17:19:35 +05:30
akshay
14384c2787 [fix] serial no button 2016-07-28 13:53:17 +05:30
Faris Ansari
8e282c2ed8 [mobile ui] fix pos payment layout #5780 2016-07-24 11:37:25 +05:30
Rohit Waghchaure
ea278b5971 [Fix]POS and timesheet issues 2016-07-22 01:22:56 +05:30
Rushabh Mehta
7e472f898d [fix] setup wizard 2016-07-21 18:01:42 +05:30
Rushabh Mehta
137e722af1 Merge pull request #5817 from rmehta/neilLasrado-schools 
Merge schools, fix setup wizard, update domainify
 2016-07-21 16:04:22 +05:30
Rushabh Mehta
20038ad2c9 [fixes] setup wizard and domainify for schools; 2016-07-21 16:01:59 +05:30
Rushabh Mehta
b0061c9341 Merge branch 'schools' of https://github.com/neilLasrado/erpnext into neilLasrado-schools 2016-07-21 10:46:32 +05:30
Nabin Hait
ba33026a6b Merge pull request #5798 from rohitwaghchaure/sales_invoice_form_is_pos_issue 
[Fix] POS auto set paid amount with outstanding amount issue
 2016-07-21 09:39:57 +05:30
Rushabh Mehta
5a39d41a0c [redesign] replace document flow with dashboard, sorry @saurabh6790, fixes #5792 2016-07-20 22:53:23 +05:30
Neil Trini Lasrado
3f0a581b85 Merge ERPNext Schools into ERPNext 2016-07-20 19:25:02 +05:30
Rushabh Mehta
39077d4210 [dashboard] for quotation and sales order 2016-07-20 18:55:42 +05:30
Rohit Waghchaure
61b4a43d84 [Fix] POS auto set paid amount with outstanding amount issue 2016-07-20 17:01:29 +05:30
Rohit Waghchaure
88514a246b set paid amount with grand amount on invoice form 2016-07-19 20:04:44 +05:30
Rushabh Mehta
76b134192f [fix] grid columns now restricted to 10 2016-07-18 14:30:27 +05:30
Rushabh Mehta
55ea7b1f61 [minor] set applicant name automatically 2016-07-15 16:43:25 +05:30
Rushabh Mehta
176b63b354 [fix] remove first row on mapping, fixes #5707 2016-07-14 17:43:48 +05:30
Saurabh
6bc7b892c4 [fix] alter fieldtype for is_group from select to check 2016-07-14 14:06:28 +05:30
Rushabh Mehta
3ce24d64c2 [cleanup] payment entry form view 2016-07-11 16:08:46 +05:30
Nabin Hait
3950507d4b [fix] Currency and exchange rate while Quotation made from Opportunity for lead 2016-07-07 11:12:44 +05:30
Rohit Waghchaure
53bea82514 [Fixes] POS amount calculation issue 2016-07-06 16:15:10 +05:30
Anand Doshi
3177138655 [fix] moved disable setup wizard access to frappe 2016-07-05 21:34:21 +05:30
Saurabh
1c5c511d2e [fix] add payment entry in document flow 2016-07-05 12:46:38 +05:30
Nabin Hait
56548cbfa2 Payment against negative invoice, negative outstanding allocation and much more 2016-07-04 11:42:25 +05:30
Nabin Hait
13093b4b68 Make payment entry aginst order, payment request and patch to rename advance table fields 2016-07-04 11:42:24 +05:30
Nabin Hait
05aefbbf5d Payment Entry from invoice 2016-07-04 11:42:24 +05:30
Nabin Hait
28a0528ae4 Advance Payment Entry adjustment against Invoice 2016-07-04 11:42:04 +05:30
Saurabh
b35906efc1 [fix] load dependancies on page load event 2016-07-02 17:13:11 +05:30
Saurabh
feefaaf1ee [fix] Stock Analytics Report page fix 2016-07-01 18:15:17 +05:30
Rushabh Mehta
65256ed8cb Merge pull request #5526 from KanchanChauhan/shopping-cart-dropdown-update 
Shopping cart dropdown update
 2016-06-29 21:59:29 +05:30
Rushabh Mehta
26a76fb2d9 Merge pull request #5566 from KanchanChauhan/moving-newsletter-to-frappe 
Newsletter moved to Frappe
 2016-06-29 12:11:25 +05:30
Kanchan Chauhan
65c8b5a216 Newsletter moved to Frappe 2016-06-28 17:28:40 +05:30
Kanchan Chauhan
a756e3f765 Reverted changes 2016-06-28 15:02:35 +05:30
Kanchan Chauhan
c8d47da6bc Shopping cart and dropdown cart update 2016-06-28 11:29:43 +05:30
Saurabh
93d68ac0c2 [fixes] change is group to check box 2016-06-27 17:16:56 +05:30
Saurabh
1702273968 [fix] rename account browser and sales browser to tree/doctype for view 2016-06-25 11:06:14 +05:30
Saurabh
3d6aecd618 [fixes] set warehouse group wise reorder level, validate ledger (leaf warehouse) on sle and bin 2016-06-25 11:06:13 +05:30
Rushabh Mehta
6e7dc12fde Merge pull request #5476 from umairsy/14-jun 
In the Setup Wizard, changed field label from Bank Account to Bank Name
 2016-06-22 12:09:01 +05:30
Rushabh Mehta
2cb7a9f235 [ux] taxes table editable 2016-06-15 16:45:03 +05:30
Rushabh Mehta
a55fb6426c [patch] mins_to_first_response in opporutnity and issue 2016-06-14 15:54:54 +05:30
Umair Sayyed
9a0ff298ce Changed field label from Bank Account to Bank Name 2016-06-14 12:25:34 +05:30
Rohit Waghchaure
9fe40d557f [POS] Enhancement to set default payment as cash, functionality to clear amount value, renamed doctype Payments and some fixes. 2016-06-14 01:11:09 +05:30
Rushabh Mehta
d1eba515e9 [cleanup] fixes to v7 2016-06-13 17:47:13 +05:30
Rushabh Mehta
e0686b32f3 [minor] cleanups 2016-06-10 12:38:52 +05:30
Rushabh Mehta
e778e59e4c [minor] always show issues in sidebar 2016-06-08 15:34:54 +05:30
Anand Doshi
16e2442278 [cleanup] document flow 2016-06-07 18:55:23 +05:30
Saurabh
a8217dc7e9 [fixes] build json fixes 2016-06-07 17:19:36 +05:30
Saurabh
2966d89e2a [fixes] create module flow list 2016-06-07 17:19:36 +05:30
Rushabh Mehta
675f9c6e6e [minor] reset barcode if item is changed, fixes #5314 2016-06-02 16:34:00 +05:30
Rushabh Mehta
aa60fd9037 [fix] new_doc to frappe.new_doc 2016-06-01 11:46:33 +05:30
Rushabh Mehta
bc92824bc4 [minor] rename item_name if same as item, on rename and removed item selector 2016-05-31 07:22:51 +05:30
Nabin Hait
37b5e0c99f Merge pull request #5399 from nabinhait/report-graph 
Charts on reports / activity page, deprecated financial analytics report
 2016-05-26 17:42:36 +05:30
Anand Doshi
ac7c81bb98 [fix] compiled erpnext.less to erpnext.css 2016-05-26 16:41:04 +05:30
Nabin Hait
b46d021f2a Charts on reports / activity page, deprecated financial analytics report 2016-05-26 15:26:01 +05:30
Nabin Hait
44c1b8e63b Line/Bar chart in Balance Sheet / Profit and Loss statement 2016-05-26 15:26:01 +05:30
Rohit Waghchaure
f2aa1764cc [POS] enhancement and minor fixes 2016-05-25 15:04:46 +05:30
Rushabh Mehta
ac123c57f3 [cleanup] website / portal css 2016-05-20 16:37:14 +05:30
Nabin Hait
3956c94bbb Merge pull request #5340 from rohitwaghchaure/support_week_new 
[Fix] Sales Invoice shows default date while no default mentioned
 2016-05-20 12:06:22 +05:30
Anand Doshi
1d88c6a742 [fix] [patch] home page + erpnext.css 2016-05-20 10:42:04 +05:30
Rohit Waghchaure
5d97d89a03 [Fix] Sales Invoice shows default date while no default mentioned 2016-05-17 15:13:17 +05:30
Rohit Waghchaure
e0934d118f [Fixes] Some changes and fixes 2016-05-16 12:01:16 +05:30
Rushabh Mehta
4b9238a03b [cleanup] homepage 2016-05-12 15:23:17 +05:30
Rushabh Mehta
d42167e0e5 [cleanup] remove Features Setup 2016-05-11 16:47:14 +05:30
Rushabh Mehta
2dd0581134 [added] domainify.py 2016-05-11 15:14:15 +05:30
Anand Doshi
a3f20ae9e6 Merge pull request #5329 from KanchanChauhan/shoppingcart-cleanup 
Shopping Cart error messages issue resolved
 2016-05-10 17:35:02 +05:30
Kanchan Chauhan
1d79f350bc Shopping Cart error messages issue resolved 2016-05-10 17:19:47 +05:30
Rohit Waghchaure
6087fe178e [Enhancement] POS 2016-05-09 23:36:15 +05:30
Anand Doshi
969863541d Merge pull request #5323 from KanchanChauhan/shoppingcart-changes 
Shopping cart dropdown changes
 2016-05-09 16:57:08 +05:30
Kanchan Chauhan
b3573a881e Shopping cart dropdown changes 2016-05-09 12:30:58 +05:30
Nabin Hait
332d29f166 Merge branch 'master' into develop 2016-05-06 16:13:35 +05:30
Neil Trini Lasrado
728d01945c redirect issues of erpnext to erpnext repository 2016-05-02 18:37:47 +05:30
Rushabh Mehta
c711b82889 Merge pull request #5296 from KanchanChauhan/websitemakeover 
New look to the website
 2016-05-02 15:54:41 +05:30
Rushabh Mehta
764aa92da4 [minor] added remember_selected in hooks and doc update 2016-05-02 13:28:59 +05:30
Kanchan Chauhan
239b351367 New look to the website 2016-05-02 11:43:44 +05:30
Rushabh Mehta
be2ee18de4 [fixed] frappe.require is now async 💥 2016-04-29 17:22:42 +05:30
Rushabh Mehta
5dfe20ce17 [fix] frappe.require in stock_entry.js 2016-04-26 12:59:08 +05:30
Rushabh Mehta
3d2622ce91 [refacator] added dashboard in item 2016-04-25 17:53:42 +05:30
Anand Doshi
a6f48688bc [enhancement] website: optionally show products as list 2016-04-22 19:10:49 +05:30
Anand Doshi
e3bd78e912 [css] portal 2016-04-22 18:53:21 +05:30
Kanchan Chauhan
e0818f8f46 Website Changes 2016-04-22 17:47:16 +05:30
Rushabh Mehta
0394aec6a4 [wip] inventory tool 2016-04-22 17:22:22 +05:30
Rushabh Mehta
621283c5c5 [enhancement] stock balance page 2016-04-21 19:00:34 +05:30
Rushabh Mehta
cd3c979207 [cleanup] website.less 2016-04-21 13:09:41 +05:30
Kanchan Chauhan
11638ba358 Changes 3 2016-04-20 16:24:25 +05:30
Kanchan Chauhan
704f248952 Changes 2 2016-04-20 16:24:24 +05:30
Kanchan Chauhan
2dbf5294a9 [WIP] No not merge 2016-04-20 16:24:24 +05:30
Rushabh Mehta
0525387328 [enhancement] added reserved_qty_for_production in bin and updated item dashboard 2016-04-18 19:27:46 +05:30
Saurabh
4bd34a58ba [fixes] fix perpetual inventory 2016-04-18 15:57:55 +05:30
jof2jc
524ebbcbb9 Added Make Receipt (Update Stock) and IsCash option on Purchase Invoice 2016-04-18 15:57:55 +05:30
Rushabh Mehta
a305c29b0e [cleanup] remove is_pro_applicable 2016-04-15 15:03:16 +05:30
Nabin Hait
972c25f78d Fixed conflict 2016-04-14 18:25:53 +05:30
Rushabh Mehta
8c9c57c8f3 [minor] update party timestamp after transaction 2016-04-13 18:22:06 +05:30
Nabin Hait
1ce6df8ff6 Merge pull request #5203 from nabinhait/credit_limit_fix 
[fix] Ignore closed sales order in credit limit validation
 2016-04-13 15:36:33 +05:30
Nabin Hait
7132bd3659 [fix] Ignore closed sales order in credit limit validation 2016-04-13 15:19:37 +05:30
Nabin Hait
09855fc3cc Merge pull request #5158 from neilLasrado/hotfix 
Removed education as a domain in ERPNext setup wizard
 2016-04-13 12:05:11 +05:30
Nabin Hait
c2ae1a7375 fixed merge conflict 2016-04-13 11:55:15 +05:30
Rushabh Mehta
8bbca6fa2e [enhancement] links menu in customer, supplier, item 2016-04-12 19:16:33 +05:30
Rushabh Mehta
5d0e8dee11 [fix] dashboard for customer, supplier 2016-04-11 17:34:49 +05:30
Rohit Waghchaure
b2e7a1f605 [Fix] Default letter head 2016-04-11 17:30:44 +05:30
Anand Doshi
2f957f27b0 [fix] apply Tax Rule for lead 2016-04-08 17:43:08 +05:30
Rushabh Mehta
203cc962f5 [enhancement] Item Selector 2016-04-08 17:21:00 +05:30
Neil Trini Lasrado
ce893499d7 Removed education as a domain in ERPNext setup wizard 2016-04-08 16:52:53 +05:30
Rushabh Mehta
78b7a53635 [cleanup] set default bold, print_hide for prints 2016-04-06 15:29:45 +05:30
Kanchan Chauhan
7379fd4b9a POS Search Fixed 2016-04-04 14:39:29 +05:30
Rushabh Mehta
bb8c6de043 [opt] transaction.js 2016-03-29 17:52:22 +05:30
mbauskar
a52472cf5b [fixes] added fields in SI and DN, moved the margin calculation to to pricing_rule.py 2016-03-24 14:07:51 +05:30
mbauskar
c79415eb96 added rate and total margin in price_list 2016-03-24 14:07:49 +05:30
Nabin Hait
68a628ea1e [fix] set recurring id after saving 2016-03-21 12:03:30 +05:30
rohitwaghchaure
cef1086441 [fix]Letterhead not being changed with change in company 2016-03-18 15:37:24 +05:30
Nabin Hait
6221117069 [fix] shipping address position in document 2016-03-16 16:23:30 +05:30
Saurabh
14d646f636 [fixes] shipping address on purchase flow 2016-03-16 16:23:30 +05:30
shreyas
77d23824df [Partial]Some more changes to enable shipping address to be displayed in PO 2016-03-16 16:23:29 +05:30
shreyas
22d26a1d82 [Partial] Fix to add Shipping address in Purchase order 2016-03-16 16:23:29 +05:30
Neil Trini Lasrado
6e343e23d9 Renamed project_name to project 2016-03-15 17:50:53 +05:30
Nabin Hait
b1f0a7d52e Merge pull request #4876 from saurabh6790/valuation_rate_on_so 
[enhancement] get valuation rate and gross profit on sales order item
 2016-03-14 19:18:58 +05:30
Anand Doshi
0179242f04 [fix] [hot] setup wizard domain 2016-03-09 16:32:13 +05:30
Saurabh
3fbf3ce852 [fixes] raise if selects product bundle as sub item in another product bundle. 2016-03-09 15:42:01 +05:30
Saurabh
5ada14b887 [fixes] calculate valuation rate for non stock item 2016-03-09 15:42:01 +05:30
Saurabh
2d7af63351 [fixe] typo-fixes and set base currency symbol to gross-profit and valuation rate 2016-03-09 15:42:00 +05:30
Saurabh
d313553ae3 [enhancement] get valuation rate and gross profit on sales order item 2016-03-09 15:42:00 +05:30
Neil Trini Lasrado
1b03e0a6d0 Added Other as a Domain in Company/setup wizard 2016-03-08 20:22:24 +05:30
Neil Trini Lasrado
342895c9df Added Domain to setup wizard 2016-03-08 19:55:57 +05:30
Anand Doshi
b073cf4fa1 [fix] POS amount_paid when not cash - Fixes #4686, #4828, #4289 2016-03-08 17:59:19 +05:30
Rushabh Mehta
756e518bc1 [fix] recurring 2016-03-03 13:00:30 +05:30
Rushabh Mehta
5839a8d7f0 [fixes] usability cleanup of recurring document and added explicit submit_on_creation 2016-03-02 17:51:52 +05:30
Rushabh Mehta
aac4dcedc8 [fix] print language and contact_email fields and removed translations 2016-03-02 15:45:09 +05:30
Rushabh Mehta
cbed331047 Merge pull request #4909 from rohitwaghchaure/multilingual_print_format_test 
Multilingual print format test
 2016-03-01 17:10:50 +05:30
rohitwaghchaure
4151e3dc92 [enhancement] Multi-lingual print format 2016-03-01 16:33:08 +05:30
Rushabh Mehta
4403853828 [minor] fix notification for material request, splash icon, cleanup project form layout 2016-02-27 16:24:34 +05:30
Neil Trini Lasrado
3c0d5cbab5 Fixes in Setup Wizard 2016-02-24 18:02:08 +05:30
saurabh
f703198082 replaced methd 2016-02-23 02:17:03 +05:30
saurabh
533a0f6527 created new file 2016-02-23 02:17:03 +05:30
Anand Doshi
561e6cd27b [fix] Trial Balance to General Ledger: use data.from_date and data.to_date 2016-02-16 11:56:53 +05:30
Anand Doshi
39a289145c [fix] fetch price list rate 2016-02-15 11:42:18 +05:30
Rushabh Mehta
eab1671214 [fix] [pos] refresh party field, fixes #4789 2016-02-11 18:35:59 +05:30
Nabin Hait
ef864403a1 [fix] call get_party_account only if party is set 2016-02-10 14:47:25 +05:30
Rushabh Mehta
8d1c7a2524 [fix] call get_party_account only if party is set 2016-02-10 13:08:42 +05:30
Nabin Hait
a731ad4433 [fix] Set party account on chnage of company 2016-02-04 17:22:57 +05:30
Nabin Hait
bd7f48cfd4 [report] Financial Statements: Accumulated periodic balance based on filters 2016-02-02 19:05:43 +05:30
ShashaQin
539a826b37 Update financial_statements.js 
Adding Accumulated Values check box on Profit and Loss, Balance Sheet
 2016-02-02 19:05:42 +05:30
Anand Doshi
afe85bdd04 [hotfix] use me.frm.doc in get_item_details 2016-01-21 21:04:16 +05:30
Nabin Hait
0d207706c1 [fix] Get item details 2016-01-21 18:47:09 +05:30
Nabin Hait
fb0b24af78 Rounding based on smallest circulating currency fraction value 2016-01-20 17:07:35 +05:30
Nabin Hait
d4507ac6a0 [fix] Round off gle due to currency conversion 2016-01-20 16:14:27 +05:30
Nabin Hait
8b63b1221f Calculate change in POS based on smallest currency fraction value 2016-01-18 17:56:55 +05:30
Rushabh Mehta
b46069d44b [cleanup] contextual buttons in sales & purchase and fix rate setting in opp -> quotation and material request -> purchase order 2016-01-15 16:59:26 +05:30
Rushabh Mehta
66eaf7e1c3 Merge pull request #4607 from saurabh6790/group_custom_buttons 
[enhance] merge customize buttons under groups
 2016-01-15 11:15:23 +05:30
Rushabh Mehta
986f6a71ec [minor] fix new customer link in POS 2016-01-14 18:15:56 +05:30
Saurabh
e23e99f4bd [enhance] merge customize buttons under groups 2016-01-13 09:18:31 +05:30
Saurabh
3ade883fd9 [fixes] place cart button via js 2016-01-12 14:09:52 +05:30
Saurabh
403ad48364 [fixes] display cart count only if item exist in cart 2016-01-12 14:09:52 +05:30
Saurabh
69f9975748 [fixes] show link to visit cart after adding item, hide cart button on cart view 2016-01-12 14:09:52 +05:30
Saurabh
df2783dbb0 [enhance] i. facility to send PR email; ii. update cart, item view and order view; 2016-01-12 14:09:52 +05:30
Anand Doshi
d8ac0f3df7 [fix] removed duplicate 'region' section as it is already in Frappe Framework 2016-01-11 18:22:02 +05:30
Raul Viveros
1d5f8d4436 fix button "Edit" encode url in address and contact template 2016-01-09 22:18:14 +01:00
Rushabh Mehta
eb961370ff [translations] fixes #4532 2016-01-04 15:48:37 +05:30
Nabin Hait
b6b56453e1 [fix] Get defaults based on doctype or fieldname 2015-12-23 16:37:06 +05:30
Nabin Hait
3769d87240 Additional Discount amount based on percentage 2015-12-18 13:12:08 +05:30
Anand Doshi
2af44ffd06 [fix] setup wizard is_private 2015-12-09 17:29:11 +05:30
Anand Doshi
70f57eb7f0 [fix] call apply price list, apply pricing rule only if price list is mentioned or there are items in the table 2015-11-27 14:38:01 +05:30
Anand Doshi
a4870118ea Merge pull request #4365 from anandpdoshi/fix/print-hide-if-0 
[fix] Show Credit/Debit as blank in Journal Entry Account if its value is 0
 2015-11-25 17:28:54 +05:30
Anand Doshi
5c968abcef [fix] Show Credit/Debit as blank in Journal Entry Account if its value is 0 2015-11-25 16:33:00 +05:30
Anand Doshi
5c3469a01e [fix] validate fiscal year dates and company name 2015-11-24 17:06:54 +05:30
Nabin Hait
e8f4790d0a [hotfix] 2015-11-16 18:10:15 +05:30
Nabin Hait
adc93b797a Merge pull request #4316 from nabinhait/advance_fix 
[fix] Invoice Outstanding calculation related to advance
 2015-11-16 15:50:32 +05:30
Anand Doshi
1ed82834ce [fix] re-make setup wizard slides on change of language 2015-11-16 12:58:14 +05:30
Nabin Hait
90c6d7bb47 [fix] Invoice Outstanding calculation related to advance 2015-11-13 14:04:03 +05:30
Rushabh Mehta
37b4d75e4a [re-org] setup wizard in frappe 2015-11-12 11:45:47 +05:30
Rushabh Mehta
97426776bd Merge pull request #4281 from nabinhait/address_fix 
[fix] Clear addressed and contacts on a new form
 2015-11-06 11:02:31 +05:30
Rushabh Mehta
b1d8979a59 Merge pull request #4179 from saurabh6790/drop-shipping 
Drop shipping
 2015-11-02 15:43:48 +05:30
Nabin Hait
915778fb69 [fix] Clear addressed and contacts on a new form 2015-10-30 14:43:13 +05:30
Anand Doshi
b0388d971a [minor] reduced size of video placeholder 2015-10-30 12:54:10 +05:30
Saurabh
2e65aadb1e [fixes] reload doc after status update and supplier address fetching 2015-10-29 19:43:35 +05:30
Saurabh
8a8ef85174 [fixes] reviwe fixes 2015-10-29 19:43:33 +05:30
Saurabh
c306b21415 [merge fixes] 2015-10-29 19:43:31 +05:30
Anand Doshi
7dab3c1f85 Show Welcome to ERPNext after completing Setup Wizard 2015-10-29 15:32:00 +05:30
Nabin Hait
bdfb070ed6 [fix] Serial No query in Warranty Claim 2015-10-28 15:38:22 +05:30
Nabin Hait
83e68bb837 minor fix 2015-10-26 17:40:31 +05:30
Nabin Hait
00818bfa90 Set tax rule based on date 2015-10-23 16:26:09 +05:30
Anand Doshi
87da662703 [enhancement] Quick Entry in Journal Entry, remember Posting Date 2015-10-21 16:27:13 +05:30
Nabin Hait
aa015902d5 Validate currency of default receivable/payable accounts 2015-10-19 15:10:11 +05:30
Rushabh Mehta
80d2a55342 [enhancement] add variants in website 2015-10-14 16:16:00 +05:30
Anand Doshi
9a4d165ba2 [fix] get_party_details.js - set posting_date if args are initialised 2015-10-12 16:23:51 +05:30
Anand Doshi
19a33994da [cleanup] removed desk_home and desk_home_flows from conf.js 2015-09-29 20:06:22 +05:30
Anand Doshi
142859f36e Merge pull request #4076 from anandpdoshi/shopping-cart-order 
check doc.has_website_permission in order.html. Merge after frappe/frappe#1316
 2015-09-28 19:40:17 +05:30
Rushabh Mehta
7f75dbf061 [cleanup] remove backup manager 2015-09-28 19:12:54 +05:30
Anand Doshi
199d8a44fc [fix] check doc.has_website_permission in order.html 2015-09-28 19:04:42 +05:30
Anand Doshi
06ad308ca1 [fixes] setup wizard and other fixes related to cart 2015-09-23 12:50:35 +05:30
Rushabh Mehta
8ffd483e24 [wip] shopping cart shipping rule, price list cleanup 2015-09-23 12:49:16 +05:30
Rushabh Mehta
156ce607e2 [cleanup] [wip] portal, shopping cart cleanup 2015-09-23 12:49:16 +05:30
Neil Trini Lasrado
09f9c96c53 Fixes in Tax Rule 2015-09-15 15:41:00 +05:30
Neil Trini Lasrado
810bd35609 Apply Tax Rule based on Customer Selection in Sales / Purchase Transactions 2015-09-15 15:41:00 +05:30
Nabin Hait
bac9b8eef6 Payment Tool changes due to multi currency 2015-08-31 19:01:11 +05:30
Nabin Hait
13d8835b75 Fixed merge conflict 2015-08-27 14:55:34 +05:30
Nabin Hait
4ffd7f3d05 Outstanding, paid and write-off amount in Invoice 2015-08-27 12:28:36 +05:30
Rushabh Mehta
00eba4d7f6 [minor] show price list in sales order (via support ticket) 2015-08-27 10:25:07 +05:30
Rushabh Mehta
b8a6f40370 [cleanup] layouts of item, customer, supplier, lead 2015-08-26 10:51:45 +05:30
Rushabh Mehta
f24f6044bd [layout] cleaned up Sales Invoice 2015-08-26 10:51:44 +05:30
Anand Doshi
fe13bfed44 Fixes to Return Improvements pull request 
- Added "Returned Qty" in Sales and Purchase Order
- Map Expense Account in Return Delivery Note
- Defined some No Copy fields
- Added "Credit Note" and "Debit Note" Print Headings
- Fixed patch
 2015-08-25 19:07:04 +05:30
Rushabh Mehta
ad9156a6ae [enhancement] POS print after save #385:wq:wq 2015-08-18 18:05:43 +05:30
Nabin Hait
6ddcac7cee minor fix 2015-08-13 11:47:35 +05:30
Rushabh Mehta
1828c12481 [refactor] added dynamic link in journal entry, #3847 2015-08-12 12:28:33 +05:30
Neil Trini Lasrado
dde65752b6 Fixed code to consider partial FG entry 2015-08-10 19:14:43 +05:30
Neil Trini Lasrado
845980c010 Added Feature - Update FG based on Material Transfer For Manufacturing 2015-08-10 19:14:43 +05:30
Rushabh Mehta
147acfd502 [fix] [mobile] abs url erpnext icon 2015-08-05 14:49:32 +05:30
Rushabh Mehta
a208c56813 [enhancement] auto insert item price if missing, #3533 2015-08-04 14:48:52 +05:30
Nabin Hait
b7c0c55d61 Validate serial no in return entry with against document 2015-08-04 12:18:12 +05:30
Nabin Hait
db53a789be [fix] Tax calculation while discount applied on net total 2015-08-03 19:10:59 +05:30
Nabin Hait
9e26bcfeeb [fix] Actual tax amount should be negative while creating return entry 2015-07-30 11:48:18 +05:30
Nabin Hait
1e046aa49a Hide buttons for return entry 2015-07-29 13:16:37 +05:30
Nabin Hait
1d21842f68 Sales / Purchase Return redesigned via negative DN / SI / PR / PI 2015-07-24 13:26:53 +05:30
Anand Doshi
906c2babaa [ui] Show ERPNext icon instead of ERPNext in navbar 2015-07-17 15:14:39 +05:30
Anand Doshi
5e849ae53e [help] added new links to Learn 2015-07-15 15:23:02 +05:30
Rushabh Mehta
2b49f9b30a [fix] pos default payment #3631 2015-07-14 11:01:42 +05:30
Neil Trini Lasrado
fe2ffaeafa Fixes in Production Planning Tool 2015-07-13 12:41:28 +05:30
Neil Trini Lasrado
09a66c4201 Fixed issue with Customer Contacts in Transaction Documents 2015-07-13 12:41:27 +05:30
Neil Trini Lasrado
ed8cecbdd8 Sales BOM renamed to Product Bundle 2015-07-13 12:41:27 +05:30
Nabin Hait
40e92b679b Posting date trigger function commonified 2015-07-09 17:12:23 +05:30
Nabin Hait
4770a1abb5 Customer's credit days based on fixed days / last day of the next month 2015-07-09 16:35:53 +05:30
Neil Trini Lasrado
75b00e3958 Mode of Payment added to POS Profile 2015-07-08 14:43:47 +05:30
Neil Trini Lasrado
e2d8dd0663 added recurring print format to sales/purchase invoice and order 2015-06-29 12:50:41 +05:30
Neil Trini Lasrado
d015195617 fixes in barcode 2015-06-09 15:21:50 +05:30
Neil Trini Lasrado
b2f550ccb3 Barcode added to Purchase Receipt 2015-06-09 15:18:58 +05:30
Nabin Hait
995a78421a [fix] Stock analytics report fixed for fifo stack related to stock reco 2015-06-03 16:44:26 +05:30
Rushabh Mehta
95b995be6d [minor] set timezone in posting time and added help 2015-05-28 12:10:55 +05:30
Nabin Hait
86e479f908 Merge pull request #3355 from rmehta/purchase-invoice-fixes 
[minor] remove letter head / terms from purchase invoice, fixes #3328, #3345
 2015-05-28 11:19:22 +05:30
Rushabh Mehta
c185734bf3 [minor] remove letter head / terms from purchase invoice, fixes #3328, #3345 2015-05-28 11:17:22 +05:30
Rushabh Mehta
beb7c346ea [fix] [cleanup] 2015-05-28 11:12:29 +05:30
Rushabh Mehta
88655890be [fix] [refactor] pos hangs in multi-company, if company is not set 2015-05-28 11:11:25 +05:30
Anand Doshi
81bded1afe [fix] Product Search 2015-05-27 16:48:06 -04:00
Nabin Hait
eb00cae86c Fiscal Year removed from Material Request 2015-05-27 13:18:09 +05:30
Nabin Hait
093beecd0a minor fix 2015-05-26 12:15:39 +05:30
Rushabh Mehta
822fd7747a [email] [website] footer cleanup 2015-05-26 12:15:39 +05:30
Rushabh Mehta
f29a618b69 [email] [website] footer cleanup 2015-05-26 12:15:39 +05:30
Nabin Hait
f3ae85cc9a Merge pull request #3313 from rmehta/material-request-fix 
[fix] load taxes_and_charges only if field present
 2015-05-21 13:22:21 +05:30
Rushabh Mehta
4984bccbc6 [fix] load taxes_and_charges only if field present 2015-05-21 12:51:07 +05:30
Rushabh Mehta
a27cca97b5 [rename] POS Setting > POS Profile #3271 2015-05-20 15:43:17 +05:30
Nabin Hait
8252117fe5 set tax amount also in base currency after manipulation 2015-05-19 16:30:17 +05:30
Nabin Hait
f59d3a4e07 conversion rate fixes 2015-05-19 16:30:16 +05:30
Rushabh Mehta
5495bc54a5 [enhancement] default terms in company, fixes #3231 2015-05-19 13:03:01 +05:30
Pratik Vyas
1a84d8ecd2 Merge branch 'develop' 2015-05-19 12:23:52 +05:30
Rushabh Mehta
4a3c805049 [fix] sms settings, fixes #3276 2015-05-19 11:10:12 +05:30
Nabin Hait
a6ee8290ce Inclusive tax for deduction and manipulation of tax amount to fix rounding issue 2015-05-15 12:02:27 +05:30
Nabin Hait
ffc7f3fef6 Apply default taxes on loading of document 2015-05-12 15:07:02 +05:30
Nabin Hait
ec361ea648 exchange rate fix 2015-05-11 18:14:45 +05:30
Nabin Hait
dd82bf2ad9 Exchange rate issue fixed 2015-05-11 16:49:31 +05:30
Rushabh Mehta
66fa1ff878 [enhancement] automatic exchange rates via jsonrates 2015-05-07 12:26:09 +05:30
Nabin Hait
0e1540b3b7 material request saving issue fixed 2015-05-05 17:26:35 +05:30
Nabin Hait
2b3e065efc [fix] taxes and charges input value 2015-05-05 16:33:58 +05:30
Nabin Hait
61092c0a88 Pos item view: show item name and item code 2015-05-05 12:27:11 +05:30
Nabin Hait
c91a9e5231 Delete company and company transactions are separate functions 2015-05-04 11:51:21 +05:30
Rushabh Mehta
c712cdb580 [fix] tax with both actual and rate type 2015-05-03 22:20:56 +05:30
Nabin Hait
f550ecf93e Maintain same currency exchnage rate while mapping 2015-05-02 18:46:42 +05:30
Nabin Hait
69cdf59d63 Maintain same currency exchnage rate while mapping 2015-05-02 18:46:29 +05:30
Nabin Hait
5207d1205e minor issue fixed for precision 2015-04-29 15:38:14 +05:30
Rushabh Mehta
45ca8a4d31 [minor] save last company in multi-company scenario 2015-04-28 16:04:56 +05:30
Rushabh Mehta
38c6b52770 [rename] group_or_ledger to is_group 2015-04-23 13:14:17 +05:30
Rushabh Mehta
50918a8fcf [pos] fixes #3138, #3140 2015-04-21 14:38:48 +05:30
Rushabh Mehta
5674c4f28c [splash] new image 2015-04-16 15:09:42 +05:30
Rushabh Mehta
d64e928b50 [favicon] darker 2015-04-16 14:04:51 +05:30
Rushabh Mehta
2e7c36ec99 [favicon] light grey for erpnext 2015-04-16 12:41:42 +05:30
Nabin Hait
3c89605e57 minor fix in taxes and totals 2015-03-23 14:33:22 +05:30
Anand Doshi
2b2b639492 fixes 2015-03-20 14:29:23 +05:30
Neil Trini Lasrado
3d61bbb36a fixes in get_serial_number function 2015-03-18 11:04:32 +05:30
Nabin Hait
a1bf43b1a6 Merged develop into v5 2015-03-17 10:50:47 +05:30
Anand Doshi
d6822ddd7c manipulate grand total for inclusive tax 2015-03-13 18:23:10 +05:30
Rushabh Mehta
f5f0d5a83a [breadcrumbs] refactor 2015-03-09 15:48:16 +05:30
Nabin Hait
e2f054cc27 transaction date issue in pricing rule fixed 2015-03-09 14:54:37 +05:30
Anand Doshi
e514323be4 load all js and css like before in desk.html 2015-03-06 13:17:26 +05:30
Rushabh Mehta
c4dce99f4b [fixes] pos #2830, #2795 2015-03-05 15:09:04 +05:30
Anand Doshi
885e074697 Changed company name from Web Notes to Frappe Technologies 2015-03-03 14:56:43 +05:30
Rushabh Mehta
b83fa3bc2d [pos] [barcode] fixes #2831 2015-03-02 18:25:14 +05:30
Rushabh Mehta
8c84fca182 [fix] #2875 2015-03-02 16:29:56 +05:30
Anand Doshi
16018dd474 removed erpnext splash 2015-03-01 21:16:44 +05:30
Nabin Hait
86cd4cc739 discount related fix 2015-02-28 19:12:55 +05:30
Nabin Hait
b7ae9b4283 Merge pull request #2866 from neilLasrado/barcode 
Barcode added to stock entry
 2015-02-27 11:35:07 +05:30
Anand Doshi
8f9e631a44 minor fixes 2015-02-26 20:29:43 +05:30
Neil Trini Lasrado
4374692cf5 fixes 2015-02-25 19:01:17 +05:30