Commit Graph

  • 613d784cfb Fixes in pricing rule Nabin Hait 2014-06-24 12:07:56 +05:30
  • efd426650d Fixes in pricing rule Nabin Hait 2014-06-24 11:11:08 +05:30
  • f62b75c731 Fixes in pricing rule Nabin Hait 2014-06-24 11:00:13 +05:30
  • 65efd0a9a1 sms sending issue fixed Nabin Hait 2014-06-23 18:21:37 +05:30
  • f08881a2b7 Merge pull request #1831 from anandpdoshi/anand-wip Anand Doshi 2014-06-23 18:15:01 +05:30
  • 83da92fdcc Naming Series Property Setter Patch Anand Doshi 2014-06-23 18:04:07 +05:30
  • 16fa6472b3 Made warehouse and selling pricing list non-mandatory in pos setting Nabin Hait 2014-06-23 16:42:11 +05:30
  • 6781f62c70 Merge pull request #1828 from rmehta/develop Anand Doshi 2014-06-23 15:53:38 +05:30
  • a445c39901 Merge pull request #1829 from nabinhait/v4-hotfix Anand Doshi 2014-06-23 15:52:54 +05:30
  • da490e3f53 Set status button in serial no Nabin Hait 2014-06-23 15:51:03 +05:30
  • ccd2e2496c Merge pull request #1827 from anandpdoshi/anand-wip Nabin Hait 2014-06-23 15:44:29 +05:30
  • 36da171a3d Set status button in serial no Nabin Hait 2014-06-23 15:36:06 +05:30
  • e84f8b23aa minor fix in sales invoice Nabin Hait 2014-06-23 10:03:23 +05:30
  • 864d1ea87f fix end of life query for item Rushabh Mehta 2014-06-23 12:20:12 +05:30
  • 58ff651c6d fixes to bom.js Rushabh Mehta 2014-06-19 14:43:54 +05:30
  • c027563b13 Merge pull request #1826 from nabinhait/v4-hotfix Anand Doshi 2014-06-20 20:44:17 +05:30
  • f0a1735ac8 Naming Series property type as Text Anand Doshi 2014-06-20 20:19:51 +05:30
  • 56f6d01757 Minor fixes Nabin Hait 2014-06-20 19:37:53 +05:30
  • 3c946b2a72 validate pricing rule discount with item max discount Nabin Hait 2014-06-20 19:07:44 +05:30
  • 1d37698d4c Reload pricing rule in patch Nabin Hait 2014-06-20 16:30:44 +05:30
  • be50c289f8 validate pricing rule discount with item max discount Nabin Hait 2014-06-20 16:19:55 +05:30
  • 444f956e7b Pricing Rule fixes and improvements. Fixes #1795 Nabin Hait 2014-06-20 15:59:49 +05:30
  • b35d84156f Merge pull request #1822 from anandpdoshi/anand-wip Rushabh Mehta 2014-06-20 11:24:45 +05:30
  • 496123a646 Inventory Accounting: Cost Center only required for Expense Account Anand Doshi 2014-06-19 19:25:19 +05:30
  • 861747ec26 Merge remote-tracking branch 'frappe/develop' into wip-4.1 Anand Doshi 2014-06-19 17:44:33 +05:30
  • 7bbaf0298e Merge pull request #1821 from nabinhait/v4-hotfix Anand Doshi 2014-06-19 16:48:53 +05:30
  • a2f5a7f3cd Merge pull request #1820 from anandpdoshi/anand-wip Rushabh Mehta 2014-06-19 16:32:50 +05:30
  • a5cfc59d81 Validate Select field values Anand Doshi 2014-06-19 15:52:19 +05:30
  • da342c7855 Fixed feed type options Anand Doshi 2014-06-18 21:09:19 +05:30
  • aecddefbc8 Fixed number format in currency Anand Doshi 2014-06-18 20:55:39 +05:30
  • fd05f458e1 Minor fix in Journal Voucher Anand Doshi 2014-06-18 20:55:18 +05:30
  • faf176d78c Overwrite from POS Settings if value exists Nabin Hait 2014-06-18 19:51:38 +05:30
  • 151125e537 fixed for travis Rushabh Mehta 2014-06-18 17:33:01 +05:30
  • 64a0eb42ed Merge pull request #1816 from nabinhait/v4-hotfix Anand Doshi 2014-06-18 17:32:04 +05:30
  • ba6cc2864a Merge pull request #1817 from anandpdoshi/anand-wip Nabin Hait 2014-06-18 17:18:26 +05:30
  • 4d7c4fc0f4 Get party details fixes Nabin Hait 2014-06-18 16:40:27 +05:30
  • e7c2f74a07 Stocvk entry incoming rate for sales return Nabin Hait 2014-06-18 16:40:08 +05:30
  • a7da6e1480 Incoming rate for sales return Nabin Hait 2014-06-18 15:12:03 +05:30
  • ae0d753cad Valuation rate and amount for fg item Nabin Hait 2014-06-18 14:42:22 +05:30
  • 31c977b906 Fixed Employee Leave Balance Report Anand Doshi 2014-06-18 16:26:45 +05:30
  • 87179346d4 Merge pull request #1814 from anandpdoshi/anand-wip Nabin Hait 2014-06-18 16:00:53 +05:30
  • d768afb80b Fixed Sales Order -> Delivery Note mapping of address fields Anand Doshi 2014-06-18 15:23:25 +05:30
  • de12a0941f Stock Entry: get fg item incoming rate if bom is mentioned Anand Doshi 2014-06-18 14:05:29 +05:30
  • 987a28fc6a Revert "Stock Entry: get fg item incoming rate if bom is mentioned" Anand Doshi 2014-06-18 14:05:08 +05:30
  • c5dbf0f8ad Travis: Install frappe of targetted branch Anand Doshi 2014-06-18 13:35:37 +05:30
  • 297939325a Stock Entry: get fg item incoming rate if bom is mentioned Anand Doshi 2014-06-18 13:10:10 +05:30
  • 2f800521cb Don't set default for warehouse when creating serial no Anand Doshi 2014-06-18 12:48:46 +05:30
  • 72a178a37e Fixed Currency Exchange error Anand Doshi 2014-06-18 12:14:17 +05:30
  • 8c7b4549ed Merge pull request #1812 from nabinhait/v4-hotfix Anand Doshi 2014-06-18 10:59:05 +05:30
  • 91090042d1 Patch: update users report view settings for rename fields Nabin Hait 2014-06-18 10:29:53 +05:30
  • 0693937c1e Fixes in fetching valuation rate in stock entry Nabin Hait 2014-06-18 09:42:27 +05:30
  • ac1a4ed576 Field renamed in sms center Nabin Hait 2014-06-18 09:02:21 +05:30
  • b73d3f925d Do not make packing list after submission Nabin Hait 2014-06-17 16:13:15 +05:30
  • 69641ddc36 Update sms_center.json Rushabh Mehta 2014-06-18 09:04:09 +05:30
  • 36881807ed Merge branch 'wip-4.2' into wip-4.1 Rushabh Mehta 2014-06-17 17:36:22 +05:30
  • 1a18b427a8 make font size smaller for erpnext powered Rushabh Mehta 2014-06-13 12:00:40 +05:30
  • 69ce97b80a added print format for general ledger Rushabh Mehta 2014-06-12 18:52:47 +05:30
  • 9f887b436c fixes new routing, for frappe/frappe#600 Rushabh Mehta 2014-06-17 16:53:44 +05:30
  • 5780163fb7 Merge remote-tracking branch 'frappe/develop' into wip-4.1 Anand Doshi 2014-06-17 14:58:18 +05:30
  • 1c5fb9495e Merge pull request #1806 from nabinhait/v4-hotfix Anand Doshi 2014-06-17 14:54:44 +05:30
  • 5df521bad5 updated generators for wip-4.2 Rushabh Mehta 2014-06-17 14:21:26 +05:30
  • be75d0265b Merge pull request #1805 from anandpdoshi/anand-wip Nabin Hait 2014-06-17 14:12:26 +05:30
  • b20de6a3ec Sales Invoice List: show percent paid as 100% if grand total is 0 Anand Doshi 2014-06-17 13:58:06 +05:30
  • 4ee8704b99 Fixes in financial analytics Nabin Hait 2014-06-17 13:52:03 +05:30
  • d2e8a0a96a Delivery note update after submission Nabin Hait 2014-06-17 12:54:45 +05:30
  • ff367c7b31 Merge pull request #1798 from nabinhait/v4-hotfix Anand Doshi 2014-06-16 16:04:32 +05:30
  • 98d9d797fd Tax category validation ignored in material request Nabin Hait 2014-06-16 15:54:05 +05:30
  • a6fc3f6337 Ignore pricing rule for material request Nabin Hait 2014-06-16 15:34:52 +05:30
  • 539f352318 Delivery note to packing slip mapping Nabin Hait 2014-06-16 15:03:02 +05:30
  • e1b2b3e995 Account common get_query Nabin Hait 2014-06-14 15:26:10 +05:30
  • 3b7bcf0f4f make font size smaller for erpnext powered Rushabh Mehta 2014-06-13 12:00:40 +05:30
  • 03ae32d937 added print format for general ledger Rushabh Mehta 2014-06-12 18:52:47 +05:30
  • ccf370f813 Fixed item query Anand Doshi 2014-06-16 13:50:11 +05:30
  • 0521814dea Fixed item query Anand Doshi 2014-06-16 13:25:20 +05:30
  • e35841a2ea Reload Shopping Cart Settings in create price list patch Anand Doshi 2014-06-16 12:59:54 +05:30
  • 3474c273a5 Ignore mandatory in employee patch Anand Doshi 2014-06-16 12:14:14 +05:30
  • 3dc722b096 Create price list only if setup complete Anand Doshi 2014-06-13 15:30:38 +05:30
  • 5002a6467d Merge pull request #1793 from anandpdoshi/anand-wip Rushabh Mehta 2014-06-13 13:20:46 +05:30
  • c1bfb63d96 Create price list if missing Anand Doshi 2014-06-13 12:41:08 +05:30
  • 27e295a4cb Merge pull request #1789 from nabinhait/v4-hotfix Anand Doshi 2014-06-12 15:39:58 +05:30
  • 99703a95c2 Merge pull request #1790 from anandpdoshi/wip-anand Rushabh Mehta 2014-06-12 15:25:03 +05:30
  • f2202fc014 minor fix Nabin Hait 2014-06-12 15:20:47 +05:30
  • 3761ff3522 Fix in patch: split email settings Anand Doshi 2014-06-12 15:00:25 +05:30
  • 205438669a Removed clear_custom_buttons, pos view switch fix Anand Doshi 2014-06-12 12:59:23 +05:30
  • e7f2d3179d update other_charges in custom print formats Nabin Hait 2014-06-12 14:58:09 +05:30
  • 277f4a1bfe Removed clear_custom_buttons, pos view switch fix Anand Doshi 2014-06-12 12:59:23 +05:30
  • 46dc3b1442 validations added in stock entry Nabin Hait 2014-06-12 12:48:28 +05:30
  • 2128c98c35 available qty validation. Fixes #1045 Nabin Hait 2014-06-12 12:42:22 +05:30
  • e98b326ba3 Stock Entry: Always set valuation rate automatically if source warehouse provided or sales return. Fixes #932 Nabin Hait 2014-06-12 12:24:11 +05:30
  • 7bcd31bddb Merge pull request #1785 from rmehta/develop Rushabh Mehta 2014-06-12 10:32:21 +05:30
  • 6def968c3c minor fix for outgoing communication email Rushabh Mehta 2014-06-12 10:31:43 +05:30
  • f2ee3cec19 Merge pull request #1784 from nabinhait/v4-hotfix Nabin Hait 2014-06-12 10:19:27 +05:30
  • 589a298096 Minor fixes in salary manager. Fixes #1754 Nabin Hait 2014-06-11 13:00:03 +05:30
  • 94c17bdf85 Update CONTRIBUTING.md Rushabh Mehta 2014-06-11 10:45:57 +05:30
  • fdfea0c17b Fixed Recurring Sales Invoice Anand Doshi 2014-06-10 17:54:04 +05:30
  • 862fe60368 Minor fix in newsletter Anand Doshi 2014-06-10 17:15:50 +05:30
  • 6a3e97a9f8 Merge pull request #1781 from anandpdoshi/hotfix Nabin Hait 2014-06-10 16:37:59 +05:30
  • 7656377f3f Show website route for generator via set_intro, fix in Support Email Settings Anand Doshi 2014-06-10 15:48:37 +05:30
  • 82029be6f9 Reload sales taxes and charges in patch Anand Doshi 2014-06-10 14:52:49 +05:30
  • 339f75eb53 Merge pull request #1780 from nabinhait/v4-hotfix Anand Doshi 2014-06-10 14:36:29 +05:30