Commit Graph

8844 Commits

Author SHA1 Message Date
Pratik Vyas
f87c72646c Merge pull request #1660 from anandpdoshi/hotfix
Fixed multilingual UOM issue
2014-05-17 00:12:14 +05:30
Anand Doshi
6664af9557 Fixed multilingual UOM issue 2014-05-17 00:07:45 +05:30
Nabin Hait
097227d5ea Merge pull request #1659 from nabinhait/v4-hotfix
translation and fraction issue fixes
2014-05-16 20:11:26 +05:30
Nabin Hait
e60853930b traslation issue fixed in setup wizard and desktop 2014-05-16 19:56:43 +05:30
Nabin Hait
091b48168e Journal voucher debit != credit #fraction issue 2014-05-16 19:56:43 +05:30
Nabin Hait
ad68d64d93 Leave approver select options in leave application and employee 2014-05-16 19:56:43 +05:30
Pratik Vyas
fa7444ec94 fix shipping rule test cases (copy name with copy_doc) 2014-05-16 15:19:51 +05:30
Pratik Vyas
3d8f8f68d8 Merge pull request #1652 from anandpdoshi/hotfix
Do not create Feed when frappe.flags.in_patch
2014-05-16 12:38:24 +05:30
Nabin Hait
a220e5d850 Update global_defaults_to_system_settings.py 2014-05-15 18:36:38 +05:30
Nabin Hait
ac3ba70ed9 Update global_defaults_to_system_settings.py 2014-05-15 18:25:57 +05:30
Nabin Hait
52b5c134fc Update global_defaults_to_system_settings.py 2014-05-15 18:25:10 +05:30
Nabin Hait
5c50e213ac Update global_defaults_to_system_settings.py 2014-05-15 18:18:32 +05:30
Pratik Vyas
740dd447b4 Merge pull request #1654 from nabinhait/v4-hotfix
fixes and patches
2014-05-15 18:11:39 +05:30
Nabin Hait
9419575126 Merged language patch with global_defaults_to_system_settings patch 2014-05-15 17:17:58 +05:30
Nabin Hait
d0a915c47a Global Defaults to system settings. Fixes #1653 2014-05-15 16:42:23 +05:30
Nabin Hait
b5a8cab8df Valuation Rate column in Stock Ledger report. Fixed #1633 2014-05-15 11:50:46 +05:30
Nabin Hait
bc7659ab90 Employee leave balance report fixes #1647 2014-05-15 11:37:12 +05:30
Anand Doshi
38d5424b21 Do not create Feed when frappe.flags.in_patch 2014-05-14 19:33:21 +05:30
Anand Doshi
3c4dba3e51 Merge pull request #1650 from nabinhait/v4-hotfix
Clear default for price_list_currency
2014-05-14 19:15:49 +05:30
Nabin Hait
ea7e3d6405 Clear default for price_list_currency 2014-05-14 18:52:06 +05:30
Anand Doshi
f70c7320d5 Merge pull request #1649 from anandpdoshi/hotfix
Pass frm to open_mapped_doc
2014-05-14 18:00:30 +05:30
Anand Doshi
54b7962eb9 Pass frm to open_mapped_doc 2014-05-14 17:38:45 +05:30
Nabin Hait
7b1698dbae Merge pull request #1646 from anandpdoshi/hotfix
Setup Wizard width, Stock Reconcilation
2014-05-14 16:57:30 +05:30
Anand Doshi
39cc1df560 Fixes #1635, Stock Reconcilation 2014-05-14 15:10:00 +05:30
Anand Doshi
5ce287d611 Setup Wizard width fix for chrome 2014-05-14 13:31:11 +05:30
Anand Doshi
51ba6f816b Fixed Setup Wizard 2014-05-13 21:02:47 +05:30
Nabin Hait
a8e7191b14 Merge pull request #1640 from anandpdoshi/print_format_lowercase
Changed Print Format files to lowercase
2014-05-13 18:21:22 +05:30
Anand Doshi
4c83e407a9 Changed Print Format files to lowercase 2014-05-13 17:58:30 +05:30
Pratik Vyas
b1f212d653 Merge pull request #1638 from anandpdoshi/hotfix
Improved Item maker in Setup Wizard. Fixes #1501 and #1601
2014-05-13 17:38:30 +05:30
Anand Doshi
0e2cf69345 Merge pull request #1636 from nabinhait/v4-hotfix
reports, print formats modified and minor fix
2014-05-13 17:31:14 +05:30
Anand Doshi
8fe0208fb6 Improved Item maker in Setup Wizard. Fixes #1501 and #1601 2014-05-13 16:52:26 +05:30
Nabin Hait
03f3a8a2ef Get taxes and charges records from matser. Fixes #1634 2014-05-13 16:38:31 +05:30
Nabin Hait
aade34b0c9 Reports and print formats modified for renamed fields 2014-05-13 16:12:37 +05:30
Nabin Hait
10f97d2e9e Merge pull request #1631 from nabinhait/v4-hotfix
daily time log summary report fixes
2014-05-13 11:41:12 +05:30
Nabin Hait
54f0d24d80 Merge branch 'develop' of github.com:frappe/erpnext into v4-hotfix 2014-05-13 11:33:09 +05:30
Nabin Hait
b76061530e Daily time log fixes #1614 2014-05-13 11:32:39 +05:30
Anand Doshi
d711209dde Fixed patches.txt 2014-05-12 19:42:38 +05:30
Nabin Hait
3b5f107a11 Merge pull request #1630 from nabinhait/v4-hotfix
fixes
2014-05-12 17:50:03 +05:30
Nabin Hait
b3bead2f06 Merge branch 'develop' of github.com:frappe/erpnext into v4-hotfix 2014-05-12 17:46:02 +05:30
Nabin Hait
827480fd2b import, export and report permission in account and pricing rule 2014-05-12 17:45:37 +05:30
Nabin Hait
0c54e2d0d0 4_0 patch dir renamed to v4_0 2014-05-12 17:44:55 +05:30
Rushabh Mehta
2fdb51f85e fixes frappe/erpnext#1627 2014-05-12 17:32:36 +05:30
Rushabh Mehta
37f54f9a35 added description to letter head in setup wizard 2014-05-12 16:45:49 +05:30
Pratik Vyas
b2ce9c5487 Merge pull request #1625 from anandpdoshi/hotfix
Added hook: setup_wizard_exception
2014-05-12 12:53:38 +05:30
Anand Doshi
02edae8fac Added hook: setup_wizard_exception 2014-05-12 12:37:32 +05:30
Nabin Hait
fb7fb73ba3 Merge pull request #1621 from nabinhait/v4-hotfix
BOM validation message fixed
2014-05-11 18:30:41 +05:30
Nabin Hait
bbfe2517ea BOM validation message fixed 2014-05-11 18:27:07 +05:30
Nabin Hait
0baf1479a3 Merge pull request #1618 from nabinhait/v4-hotfix
Test case fixes for serial no
2014-05-11 13:11:02 +05:30
Nabin Hait
2f50b85f99 Test case fixes for serial no 2014-05-11 13:03:53 +05:30
Nabin Hait
8ae4bcac58 Merge pull request #1617 from nabinhait/v4-hotfix
test case fixes
2014-05-11 12:13:16 +05:30