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

1390 Commits

Author SHA1 Message Date
Rushabh Mehta
c9850f9e04 Merge pull request #5077 from frappe/master 
Master
 2016-03-29 11:59:32 +05:30
Rushabh Mehta
9904c5acf4 Merge pull request #5050 from neilLasrado/develop 
Fixes Translations
 2016-03-29 10:51:44 +05:30
Rushabh Mehta
e1b20a0b29 Merge pull request #5044 from rohitwaghchaure/add_margin_feature 
[Enhancement] Add margin in sales flow.
 2016-03-28 18:27:05 +05:30
Neil Trini Lasrado
b176dea74e Fixed issues in Pricing Rule if multiple pricing rules existed with same priority 2016-03-28 13:23:47 +05:30
Neil Trini Lasrado
b6d9946854 Fixes Translations 2016-03-28 12:44:05 +05:30
Rushabh Mehta
c20c536f28 [fix] [wip] cleanup for collaborative pm 2016-03-25 17:22:17 +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
c1331d0e8e [minor-fix] pricing rule test-case fix 2016-03-24 14:07:51 +05:30
mbauskar
75b6fbb6a7 [fix] apply pricing rule added type and rate on ignore pricing rule trigger 2016-03-24 14:07:50 +05:30
mbauskar
b6d19bcfc2 [fixes] minor fixes, added eval on pricing rule, Sales Order Item, Quotation Item 2016-03-24 14:07:50 +05:30
mbauskar
dcd8b7773d [fix] calculated rate on py side, added depends on for sales order item 2016-03-24 14:07:50 +05:30
mbauskar
5e76a1cffa [fix] added eval for total margin and margin rate field 2016-03-24 14:07:50 +05:30
mbauskar
ea60c635ab changed the description of rate fields depending on margin type and if ignore pricing is unchecked returned the rate=0 2016-03-24 14:07:48 +05:30
mbauskar
8c8fa17a9b [new fields] added Margin type (Percetage/Amount) and Rate field to capture Margin details in Pricing Rule, Sales Order Item, Quotation Item 2016-03-24 14:07:48 +05:30
Anand Doshi
a75fe1a4c3 Revert "[cleanup] PayPal payment UX and moved related methods to hooks of respective apps" 2016-03-23 11:59:24 +05:30
Rushabh Mehta
eec21d041c Merge pull request #5028 from anandpdoshi/paypal-cleanup 
[cleanup] PayPal payment UX and moved related methods to hooks of respective apps
 2016-03-23 11:50:46 +05:30
Anand Doshi
71b90b7b7d [cleanup] PayPal payment UX and moved related methods to hooks of respective apps 2016-03-21 17:50:02 +05:30
Nabin Hait
c8baa01e9c [fix] Updated modified datetime 2016-03-21 17:20:03 +05:30
Nabin Hait
9a75530c26 [fix] reload doctype for renaming project 2016-03-18 16:19:25 +05:30
Nabin Hait
5996b2f1bb [fix] recurring document logic 2016-03-18 15:19:54 +05:30
rohitwaghchaure
90ff509f6d [fix]Earlier recurring billing 2016-03-18 10:44:53 +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
Neil Trini Lasrado
f433a5a124 Fixed bug while selecting project in sales_invoice, sales_order, delivery_note 2016-03-16 16:00:27 +05:30
Neil Trini Lasrado
6e343e23d9 Renamed project_name to project 2016-03-15 17:50:53 +05:30
Nabin Hait
89301863e5 minot fixes 2016-03-15 15:20:49 +05:30
rohitwaghchaure
c54b805981 [fixes]Unable set recurring date in sales order 2016-03-14 19:03:22 +05:30
Saurabh
c54619570a [fixes] check party_account_currency while creating Pull Request from Sales Invoice 2016-03-14 15:55:23 +05:30
Saurabh
9f94266892 [fixes] fetch value from grand total field while creating payment request from si 2016-03-14 11:23:03 +05:30
Anand Doshi
c75c1d7e3e [fix] additional fixes after deprecating Fiscal Year 2016-03-11 14:56:19 +05:30
Valmik Jangla
063946a02f Removed from Purchase Invoice and Purchase Reciept 2016-03-11 13:07:48 +05:30
Valmik Jangla
d89dcf60e6 Removed from Delivery Note and Appraisal 
Added back in Stock Ledger Entry
Added validation in GL Entry and SL Entry
Stock Controller sets Fiscal Year using Posting Date
 2016-03-11 13:07:48 +05:30
Valmik Jangla
d4ac3d8ceb Removed from Stock Ledger Entry and Sales Invoice 2016-03-11 13:07:48 +05:30
Valmik Jangla
cd9daf6671 Removed from Journal Entry and Stock Reconciliation 2016-03-11 13:07:16 +05:30
Valmik Jangla
c7e774fda9 BudgetError Fix 2016-03-11 13:05:20 +05:30
Valmik Jangla
865d547965 Removed from GL Entry, Opportunity and Quotation 2016-03-11 13:05:20 +05:30
Valmik Jangla
57b69cecbf Removed from C-Form 2016-03-11 13:05:19 +05:30
Valmik Jangla
c4c603dcd2 Removed from Expense Claim 2016-03-11 13:05:19 +05:30
shreyas
6c89bb1900 [Minor] Moved company field to top of the form, making it more consistent other doctypes 2016-03-11 12:12:30 +05:30
Nabin Hait
dd8dbe000b [fix] Rearranged position of mode_of_payment in sales invoice 2016-03-10 10:58:31 +05:30
Rushabh Mehta
1396b776bc [fix] print hide for submit_on_creation 2016-03-03 13:57:15 +05:30
Rushabh Mehta
7114b7786e [fix] print hide for submit_on_create 2016-03-03 13:12:21 +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
39a6f804bf Merge pull request #4871 from ShashaQin/patch-27 
Improvements about recurring documents
 2016-03-01 16:06:33 +05:30
Rushabh Mehta
ddeb576d52 Merge pull request #4849 from rasos/patch-1 
Create at_austria_chart_Einheitskontenrahmen.json
 2016-03-01 16:05:13 +05:30
Nabin Hait
bdf0f0a08d [fix] Show debit note button in purchase invoice 2016-02-26 16:26:28 +05:30
Nabin Hait
0f6eac3b35 [fix] Show credit note button in sales invoice 2016-02-26 13:01:32 +05:30