Commit graph

173 commits

Author SHA1 Message Date
Karl Cordes b29bcaf3c8 Trying to speed up doc index 2016-05-17 22:48:43 +10:00
Karl Cordes affda516e4 Hopefully fix merge conflict 2016-05-17 22:11:28 +10:00
Karl Cordes 018b2b0c1b Hopefully fixed merge conflicts 2016-05-16 22:56:04 +10:00
Karl Cordes 2105f9ee44 Removed dupe email_pdf function 2016-05-16 22:40:54 +10:00
Karl Cordes 1ef6cad142 Bump version number 2016-05-07 15:27:45 +10:00
Karl Cordes cdb2ec8cf6 Resolved merge between develop and master 2016-05-02 16:05:54 +10:00
Karl Cordes 642193c889 Merge branch 'dev' 2016-05-01 17:39:27 +10:00
Karl Cordes 05331f3736 Change DB config for dev-prod 2016-05-01 17:32:56 +10:00
Karl Cordes 424594004e Disabled debug 2016-05-01 16:48:22 +10:00
Karl Cordes fa40c66588 Fix case on signature required template 2016-05-01 13:47:13 +10:00
Karl Cordes 819d4ea459 Fixing missing variable in OA email template 2016-05-01 13:38:29 +10:00
Karl Cordes e8de034c56 I forgot how to do PHP apparently. 2016-05-01 13:21:52 +10:00
Karl Cordes 3af9f1a799 I forgot how to do PHP apparently. 2016-05-01 13:20:44 +10:00
Karl Cordes 224719598e Enable debug to see what is fucked 2016-05-01 13:18:48 +10:00
Karl Cordes 7ce45bc4e0 Hopefully fixed the dodgy subject 2016-05-01 13:16:25 +10:00
Karl Cordes cbea64ec75 Hopefully fixed the dodgy subject 2016-05-01 13:14:01 +10:00
Karl Cordes 4284e0c0f8 Fix php string append operator 2016-05-01 13:04:53 +10:00
Karl Cordes 334cc4c431 Fixed path to signature required email template. Improved the dodgy subject line perhaps 2016-05-01 13:01:25 +10:00
Karl Cordes 44179469d8 Added signature required OrderAck email templates 2016-05-01 12:46:16 +10:00
Karl Cordes 29f5206f93 Changed signature required from checkbox to select 2016-05-01 12:02:38 +10:00
Karl Cordes 19afd0d475 Added signature required field to OA doc element 2016-05-01 11:58:12 +10:00
Karl Cordes 1c48dda0e8 Added signature_required migration to oa 2016-04-30 16:51:30 +10:00
Karl Cordes a00bab386d Added terms and conditions PDF 2016-04-30 15:55:48 +10:00
Karl Cordes 9a29409107 Vaguely working 2016-04-30 13:02:57 +10:00
Karl Cordes 17c5a138de Removed short tags 2016-04-30 12:36:27 +10:00
Karl Cordes caf7050e7f This code is so fragile due to cakephp being fucked. So many regrets of framework choice 2016-04-30 12:33:03 +10:00
Karl Cordes 446bf72898 Attempting to make this run on modern PHP versions. Sigh 2016-04-30 12:19:02 +10:00
Karl Cordes 2464a39465 Updated email settings per Dec19-20 emails from Con 2015-12-20 13:25:44 +11:00
Karl Cordes 5936375271 Oh god short tages everywehre 2015-06-07 16:20:51 +10:00
Karl Cordes d07685cdc9 Fixed enq register tags 2015-06-07 16:19:06 +10:00
Karl Cordes ce3d605ae1 Fixed core.php 2015-06-02 00:04:22 +10:00
Karl Cordes 8584bb96b6 Added core.php 2015-06-02 00:02:33 +10:00
Karl Cordes b3cae84929 Added database.php config to help with auto deploys 2015-05-31 23:40:13 +10:00
Karl Cordes 3bae4702e4 Changed the placement of the search box 2014-04-21 18:44:40 +10:00
Karl Cordes 3651828964 Removed sanitizing which was breaking Midwest model numbers 2014-04-21 18:37:21 +10:00
Karl Cordes 1259b2467b Added some styling to the searchbox 2014-04-21 18:34:18 +10:00
Karl Cordes 7db15ada3e Added product autocomplete view 2014-04-21 18:23:54 +10:00
Karl Cordes 156ec39115 Bump to version 1.0.0 2014-04-21 18:16:53 +10:00
Karl Cordes dcf2501f6e implemented search for adding and editing line items. 2014-04-21 18:14:09 +10:00
Karl Cordes 44026e53d9 Fixed indents 2014-04-21 15:35:39 +10:00
Karl Cordes 38499864a9 Fixed indenting 2014-04-21 15:30:09 +10:00
Karl Cordes a50ec14b5d Failed to make this stupid add line items any better whatsoever 2013-11-14 18:21:08 +11:00
Karl Cordes 93a24c6b62 Added PO sending fix from live server debug 2013-11-11 23:08:41 +11:00
Karl Cordes c2649eb739 Removed select2 2013-11-11 14:12:55 +11:00
Karl Cordes b2aa4333a6 Select2 is going to cause more problems than it solves 2013-11-11 14:12:39 +11:00
Karl Cordes 373103c7c3 Added undelete link to archived enquiries 2013-07-15 21:52:11 +10:00
Karl Cordes 4715c39b0f Added delete and undelete functions for enquiries. 2013-07-15 20:27:28 +10:00
Karl Cordes 7d95c07d84 Supressing errors in core.php 2013-07-06 10:48:21 +10:00
Karl Cordes 0d72adb804 Change 2013-06-27 00:22:32 +10:00
Karl Cordes 6baaff4ec5 Changed wording 2013-06-27 00:19:24 +10:00
Karl Cordes ef536a285b Added primary contact column to user view 2013-06-27 00:12:29 +10:00
Karl Cordes ff47f0a413 Added migrations 2013-06-27 00:06:08 +10:00
Karl Cordes fbfc0a9543 Added primary contact to send emails to 2013-06-27 00:03:24 +10:00
Karl Cordes c1f7384550 Got this damn thing working 2013-06-23 18:31:21 +10:00
Karl Cordes 6549c00b49 Implemented POs 2013-06-23 12:05:59 +10:00
Karl Cordes 58da2bd273 border change 2013-06-16 11:29:39 +10:00
Karl Cordes 3f1c37057d Implemented PO first page. Added extra PO field migration 2013-06-15 18:32:14 +10:00
Karl Cordes e2b1af84d8 Fixed saving PackingLists 2013-06-14 22:44:01 +10:00
Karl Cordes 2738882b54 Implemented packing lists 2013-06-10 19:27:23 +10:00
Karl Cordes 7460c74e80 Added notes and product codes to clone product 2013-06-09 16:39:36 +10:00
Karl Cordes 0211c87741 Work on packing lists. Fixed problem cloning products 2013-06-09 16:37:00 +10:00
Karl Cordes 834a7d233a Misc change on costings controller 2013-06-09 14:59:34 +10:00
Karl Cordes b8866b4d03 Refactored copying of models on document_controller to make it more DRY. Changed invoice and OA PDF templates per email on May 14 2013-06-09 14:09:30 +10:00
Karl Cordes 95140a9a4b Copy DocumentAttachments to new doc when revising the quote 2013-06-08 17:26:29 +10:00
Karl Cordes 5c9a8d3093 Remove issue_date when creating a new Invoice from an OA. Closes #98 2013-06-08 11:40:38 +10:00
Karl Cordes 4a12dbe2e6 Added message re blank invoices 2013-06-03 20:01:00 +10:00
Karl Cordes 43bfe22add Fixed issue with discounts on line item table 2013-05-30 23:34:10 +10:00
Karl Cordes ed08821e8e Copy OA details to invoices 2013-05-30 07:49:44 +10:00
Karl Cordes 6fe62ce71b Merge branch 'develop' of github.com:kzrl/CMC-Sales into develop 2013-05-29 22:15:43 +10:00
Karl Cordes 68900c347a Added 4px padding to PDF details box 2013-05-29 22:13:56 +10:00
Karl Cordes 3bba7e057b Added PHPExcel 2013-05-27 23:26:35 +10:00
Karl Cordes f5a07bae4e Misc costing work. Going to try to generate Excel costings 2013-05-05 18:42:35 +10:00
Karl Cordes b793d6dc31 Added new TCPDF. Fixed the breaking issue by allow pagebreaks. 2013-05-01 22:13:44 +10:00
Karl Cordes 39a85b98a0 Document text changes per Cons emails 2013-05-01 21:57:09 +10:00
Karl Cordes 351402e030 Added OA pdf shipping billing box per Cons request 2013-04-29 23:37:27 +10:00
Karl Cordes 573971310d Added shipments delete 2013-04-29 23:00:24 +10:00
Karl Cordes 24eaa4c0cd added currency to job table 2013-04-29 22:30:18 +10:00
Karl Cordes d107e13bc5 changed button text 2013-04-28 11:57:50 +10:00
Karl Cordes e6150eba07 Added PO view. Bumped version number 2013-04-28 11:54:11 +10:00
Karl Cordes 56b487c30e Refactored saving documents into a method 2013-04-22 22:57:57 +10:00
Karl Cordes f9a8628135 Instructions on how to make OAs 2013-04-20 15:57:30 +10:00
Karl Cordes 185572f824 Started PO PDF view 2013-04-18 19:18:40 +10:00
Karl Cordes a484786737 Lots of work on documents. OAs can now be made without a new job. Job can be changed. 2013-04-14 13:14:11 +10:00
Karl Cordes 9485f80428 Added address selection to POs. 2013-04-13 20:01:47 +10:00
Karl Cordes 52bc47658b Averaging the GP on the reports. Closes #47 2013-04-13 11:28:17 +10:00
Karl Cordes e1faa4689b Added link to open email body in new window 2013-04-10 19:34:08 +10:00
Karl Cordes fd7e9f798f Added quotes to view attachment view to stop truncating filenames 2013-04-09 19:37:04 +10:00
Karl Cordes 65aaf2c0a2 Archived attachments not displayed in add attachment to document dropdown 2013-04-09 07:56:34 +10:00
Karl Cordes b44422d14c Added archived list view. 2013-04-09 07:48:36 +10:00
Karl Cordes 9ebce08617 Quick fix for the attachments index 2013-04-08 22:49:34 +10:00
Karl Cordes 5939dc5815 Quick fix for the attachments index 2013-04-08 22:45:32 +10:00
Karl Cordes bbe09e7bd6 Quick fix for the attachments index 2013-04-08 22:43:31 +10:00
Karl Cordes a545b74a1b Quick fix for the attachments index 2013-04-08 22:42:22 +10:00
Karl Cordes 356b9ef9bf Removed attachment deleting. Attachments files can now be edited 2013-04-08 22:28:27 +10:00
Karl Cordes 800cec1a0d Changed logic on jobs JS for exports. Dissalow AUD values 2013-04-07 12:04:18 +10:00
Karl Cordes f66b0bebc3 Fixed vault lockfile path 2013-04-07 08:44:37 +10:00
Karl Cordes 6282ab5997 Merge branch 'develop' of github.com:kzrl/CMC-Sales into develop 2013-04-06 12:28:49 +11:00
Karl Cordes 37528154c5 Removed dead link to edit job page 2013-04-06 12:28:05 +11:00
Karl Cordes 3f39f50851 Added ip to config check 2013-04-05 13:42:44 +11:00
Karl Cordes e5bfd530d3 Fixed email text per #69 2013-04-04 22:46:41 +11:00