Commit Graph

9056 Commits

Author SHA1 Message Date
Anand Doshi
5780163fb7 Merge remote-tracking branch 'frappe/develop' into wip-4.1 2014-06-17 14:58:18 +05:30
Anand Doshi
1c5fb9495e Merge pull request #1806 from nabinhait/v4-hotfix
Fixes
2014-06-17 14:54:44 +05:30
Nabin Hait
be75d0265b Merge pull request #1805 from anandpdoshi/anand-wip
Sales Invoice List: show percent paid as 100% if grand total is 0
2014-06-17 14:12:26 +05:30
Anand Doshi
b20de6a3ec Sales Invoice List: show percent paid as 100% if grand total is 0 2014-06-17 13:58:06 +05:30
Nabin Hait
4ee8704b99 Fixes in financial analytics 2014-06-17 13:52:03 +05:30
Nabin Hait
d2e8a0a96a Delivery note update after submission 2014-06-17 12:55:52 +05:30
Anand Doshi
ff367c7b31 Merge pull request #1798 from nabinhait/v4-hotfix
Account common get_query
2014-06-16 16:04:32 +05:30
Nabin Hait
98d9d797fd Tax category validation ignored in material request 2014-06-16 15:54:05 +05:30
Nabin Hait
a6fc3f6337 Ignore pricing rule for material request 2014-06-16 15:34:52 +05:30
Nabin Hait
539f352318 Delivery note to packing slip mapping 2014-06-16 15:03:36 +05:30
Nabin Hait
e1b2b3e995 Account common get_query 2014-06-16 15:03:36 +05:30
Anand Doshi
ccf370f813 Fixed item query 2014-06-16 13:50:11 +05:30
Anand Doshi
0521814dea Fixed item query 2014-06-16 13:25:20 +05:30
Anand Doshi
e35841a2ea Reload Shopping Cart Settings in create price list patch 2014-06-16 12:59:54 +05:30
Anand Doshi
3474c273a5 Ignore mandatory in employee patch 2014-06-16 12:14:21 +05:30
Anand Doshi
3dc722b096 Create price list only if setup complete 2014-06-13 15:30:38 +05:30
Rushabh Mehta
5002a6467d Merge pull request #1793 from anandpdoshi/anand-wip
Create price list if missing
2014-06-13 13:20:46 +05:30
Anand Doshi
c1bfb63d96 Create price list if missing 2014-06-13 12:41:08 +05:30
Anand Doshi
27e295a4cb Merge pull request #1789 from nabinhait/v4-hotfix
V4 hotfix
2014-06-12 15:39:58 +05:30
Rushabh Mehta
99703a95c2 Merge pull request #1790 from anandpdoshi/wip-anand
Fixes split email settings, removed clear custom buttons, pos view switch
2014-06-12 15:25:03 +05:30
Nabin Hait
f2202fc014 minor fix 2014-06-12 15:20:47 +05:30
Anand Doshi
3761ff3522 Fix in patch: split email settings 2014-06-12 15:00:52 +05:30
Anand Doshi
205438669a Removed clear_custom_buttons, pos view switch fix 2014-06-12 15:00:51 +05:30
Nabin Hait
e7f2d3179d update other_charges in custom print formats 2014-06-12 14:58:09 +05:30
Anand Doshi
277f4a1bfe Removed clear_custom_buttons, pos view switch fix 2014-06-12 12:59:23 +05:30
Nabin Hait
46dc3b1442 validations added in stock entry 2014-06-12 12:48:28 +05:30
Nabin Hait
2128c98c35 available qty validation. Fixes #1045 2014-06-12 12:42:22 +05:30
Nabin Hait
e98b326ba3 Stock Entry: Always set valuation rate automatically if source warehouse provided or sales return. Fixes #932 2014-06-12 12:25:23 +05:30
Rushabh Mehta
7bcd31bddb Merge pull request #1785 from rmehta/develop
minor fix for outgoing communication email
2014-06-12 10:32:21 +05:30
Rushabh Mehta
6def968c3c minor fix for outgoing communication email 2014-06-12 10:31:43 +05:30
Nabin Hait
f2ee3cec19 Merge pull request #1784 from nabinhait/v4-hotfix
Minor fixes in salary manager. Fixes #1754
2014-06-12 10:19:27 +05:30
Nabin Hait
589a298096 Minor fixes in salary manager. Fixes #1754 2014-06-11 13:00:31 +05:30
Rushabh Mehta
94c17bdf85 Update CONTRIBUTING.md 2014-06-11 10:45:57 +05:30
Anand Doshi
fdfea0c17b Fixed Recurring Sales Invoice 2014-06-10 17:54:04 +05:30
Anand Doshi
862fe60368 Minor fix in newsletter 2014-06-10 17:15:50 +05:30
Nabin Hait
6a3e97a9f8 Merge pull request #1781 from anandpdoshi/hotfix
Reload sales taxes and charges in patch
2014-06-10 16:37:59 +05:30
Anand Doshi
7656377f3f Show website route for generator via set_intro, fix in Support Email Settings 2014-06-10 15:48:37 +05:30
Anand Doshi
82029be6f9 Reload sales taxes and charges in patch 2014-06-10 14:52:49 +05:30
Anand Doshi
339f75eb53 Merge pull request #1780 from nabinhait/v4-hotfix
minor fix in global defaults
2014-06-10 14:36:29 +05:30
Nabin Hait
7425634692 minor fix in global defaults 2014-06-10 14:12:28 +05:30
Anand Doshi
38d5407ea1 Merge pull request #1779 from nabinhait/v4-hotfix
Fixes
2014-06-10 11:40:26 +05:30
Nabin Hait
6febfca5a6 changed insert after for india related custom fields 2014-06-10 11:21:38 +05:30
Nabin Hait
7cba72a0b7 Pricing Rule: price / discount percentage can not be negative 2014-06-10 11:09:21 +05:30
Anand Doshi
fb6c003c97 Merge pull request #1778 from nabinhait/v4-hotfix
update custom print formats for renamed fields
2014-06-10 10:43:51 +05:30
Nabin Hait
91016ba989 update custom print formats for renamed fields 2014-06-10 10:41:37 +05:30
Nabin Hait
2aaf1de7fe Merge pull request #1777 from anandpdoshi/hotfix
Default Letterhead, Item wise Price List Rate
2014-06-09 18:52:28 +05:30
Anand Doshi
b527e54809 Fixed report: Item wise Price List Rate 2014-06-09 18:08:46 +05:30
Anand Doshi
c01db5fe9c Save default letterhead 2014-06-09 18:01:14 +05:30
Anand Doshi
534ebde638 Merge pull request #1775 from nabinhait/v4-hotfix
create custom fields for india specific fields
2014-06-09 16:23:21 +05:30
Nabin Hait
d532d2f64f create custom fields for india specific fields 2014-06-09 16:00:49 +05:30