/[drupal]/contributions/modules/erp/erp.inc
ViewVC logotype

Log of /contributions/modules/erp/erp.inc

Parent Directory Parent Directory | Revision Log Revision Log | View Revision Graph Revision Graph


Links to HEAD: (view) (download) (as text) (annotate)
Sticky Tag:

Revision 1.23.2.10
Fri Nov 20 11:04:42 2009 UTC (5 days, 20 hours ago) by simon
Branch: DRUPAL-6--1
Changes since 1.23.2.9: +1 -1 lines
FILE REMOVED
Removing erp.inc, its been merged into erp.module

Revision 1.23.2.9 - (view) (download) (as text) (annotate) - [select for diffs]
Mon Nov 16 07:39:02 2009 UTC (9 days, 23 hours ago) by simon
Branch: DRUPAL-6--1
CVS Tags: DRUPAL-6--1-0-BETA1
Changes since 1.23.2.8: +5 -5 lines
Diff to previous 1.23.2.8 , to branch point 1.23
* Fixes and additions noted since we went live using erp for 6.x

Revision 1.23.2.8 - (view) (download) (as text) (annotate) - [select for diffs]
Sun Nov 15 00:56:12 2009 UTC (11 days, 6 hours ago) by simon
Branch: DRUPAL-6--1
Changes since 1.23.2.7: +33 -1 lines
Diff to previous 1.23.2.7 , to branch point 1.23
* Fixed ahah vs validation
* other small fixes

Revision 1.23.2.7 - (view) (download) (as text) (annotate) - [select for diffs]
Sun Nov 1 03:53:33 2009 UTC (3 weeks, 4 days ago) by simon
Branch: DRUPAL-6--1
Changes since 1.23.2.6: +4 -4 lines
Diff to previous 1.23.2.6 , to branch point 1.23
Lots and lost of fixes and improvements
Almost ready for beta status

Revision 1.23.2.6 - (view) (download) (as text) (annotate) - [select for diffs]
Tue Oct 6 22:14:19 2009 UTC (7 weeks, 1 day ago) by simon
Branch: DRUPAL-6--1
Changes since 1.23.2.5: +10 -2 lines
Diff to previous 1.23.2.5 , to branch point 1.23
Updated default views, Got job module closer to usable, more drupal_write_record

Revision 1.23.2.5 - (view) (download) (as text) (annotate) - [select for diffs]
Sun Sep 20 23:36:57 2009 UTC (2 months ago) by simon
Branch: DRUPAL-6--1
Changes since 1.23.2.4: +7 -7 lines
Diff to previous 1.23.2.4 , to branch point 1.23
Fixes to:
erp_stock
erp_cart

Tidy up of
erp_customer

Views tweakage

Revision 1.23.2.4 - (view) (download) (as text) (annotate) - [select for diffs]
Tue Sep 8 12:54:31 2009 UTC (2 months, 2 weeks ago) by simon
Branch: DRUPAL-6--1
Changes since 1.23.2.3: +38 -66 lines
Diff to previous 1.23.2.3 , to branch point 1.23
Lots more changes getting things working smoothly, removing bugs and updating thins from our old 4.7 branch

Revision 1.23.2.3 - (view) (download) (as text) (annotate) - [select for diffs]
Fri Sep 4 01:51:13 2009 UTC (2 months, 3 weeks ago) by simon
Branch: DRUPAL-6--1
Changes since 1.23.2.2: +160 -248 lines
Diff to previous 1.23.2.2 , to branch point 1.23
Massive changes:
* Updated most things to be drupal6 compliant
* Can now add invoice/quote/cash sale lines with ajax

Revision 1.23.2.2 - (view) (download) (as text) (annotate) - [select for diffs]
Thu Jul 2 03:09:39 2009 UTC (4 months, 3 weeks ago) by simon
Branch: DRUPAL-6--1
Changes since 1.23.2.1: +452 -0 lines
Diff to previous 1.23.2.1 , to branch point 1.23
Adding more files for 6.x-dev

Revision 1.16.2.1 - (view) (download) (as text) (annotate) - [select for diffs]
Mon Aug 11 01:52:05 2008 UTC (15 months, 2 weeks ago) by simon
Branch: DRUPAL-5
Changes since 1.16: +190 -63 lines
Diff to previous 1.16 , to next main 1.23
Updating the actualy drupal-5 branch as well

Revision 1.23.2.1
Mon Aug 11 01:16:48 2008 UTC (15 months, 2 weeks ago) by simon
Branch: DRUPAL-6--1
Changes since 1.23: +0 -359 lines
FILE REMOVED
file erp.inc was added on branch DRUPAL-6--1 on 2009-07-02 03:09:39 +0000

Revision 1.23 - (view) (download) (as text) (annotate) - [select for diffs]
Mon Aug 11 01:16:48 2008 UTC (15 months, 2 weeks ago) by simon
Branch: MAIN
CVS Tags: HEAD
Branch point for: DRUPAL-6--1
Changes since 1.22: +153 -127 lines
Diff to previous 1.22
Bringing all code up to date with our local development of 5.x
Way to many changes to list, but og dependancy has been removed, and most things
work except add/remove lines from invoices, quotes etc.

Revision 1.16.4.11 - (view) (download) (as text) (annotate) - [select for diffs]
Sun May 11 12:43:40 2008 UTC (18 months, 2 weeks ago) by simon
Branch: DRUPAL-4-7
Changes since 1.16.4.10: +36 -1 lines
Diff to previous 1.16.4.10 , to branch point 1.16 , to next main 1.23
Added by LachlanGunn: New features
* Ability to select default stores for sales Report
* Ability to update store setting for all users
* Allow emailing statements
* Add phone numbers to statement output
Fixed by Singularo: Various things
* Recurring edit creates duplicate
* Phone numbers fields need to be larger
* Make PO Field functional on invoices
* Recurring transactions keep the original created date
* Invoice should be "Tax Invoice"
Added by Singularo: New features
* Better reporting
* Better purchase order searching

Revision 1.16.4.10 - (view) (download) (as text) (annotate) - [select for diffs]
Sat Jan 5 07:33:29 2008 UTC (22 months, 3 weeks ago) by simon
Branch: DRUPAL-4-7
Changes since 1.16.4.9: +6 -6 lines
Diff to previous 1.16.4.9 , to branch point 1.16
Bringing CVS back up to date with our local svn version.

Revision 1.16.4.9 - (view) (download) (as text) (annotate) - [select for diffs]
Mon Sep 10 11:24:42 2007 UTC (2 years, 2 months ago) by simon
Branch: DRUPAL-4-7
Changes since 1.16.4.8: +63 -122 lines
Diff to previous 1.16.4.8 , to branch point 1.16
More changes from our live installation

Revision 1.16.4.8 - (view) (download) (as text) (annotate) - [select for diffs]
Wed Aug 8 12:37:02 2007 UTC (2 years, 3 months ago) by simon
Branch: DRUPAL-4-7
Changes since 1.16.4.7: +45 -24 lines
Diff to previous 1.16.4.7 , to branch point 1.16
Lots of changes and bugfixes. Bringing everything up to date with our
production implementation.

Revision 1.22 - (view) (download) (as text) (annotate) - [select for diffs]
Sun Jun 24 10:55:00 2007 UTC (2 years, 5 months ago) by simon
Branch: MAIN
Changes since 1.21: +29 -24 lines
Diff to previous 1.21
Quick port of 4-7 patches and progress to the 5.x version
Still buggy

Revision 1.16.4.7 - (view) (download) (as text) (annotate) - [select for diffs]
Sun Jun 24 09:50:16 2007 UTC (2 years, 5 months ago) by simon
Branch: DRUPAL-4-7
Changes since 1.16.4.6: +22 -17 lines
Diff to previous 1.16.4.6 , to branch point 1.16
Added stock adjustment
Added stock/sales report
A few bugfixes/extra features

Revision 1.21 - (view) (download) (as text) (annotate) - [select for diffs]
Sun May 27 13:04:12 2007 UTC (2 years, 6 months ago) by simon
Branch: MAIN
CVS Tags: DRUPAL-5--1-1
Changes since 1.20: +104 -21 lines
Diff to previous 1.20
Lots of changes to get a valid install profile working for erp.
Read INSTALL.txt for a brief rundown/howto.
There is one glitch, which I fixed with a small patch, attached to this
issue - http://drupal.org/node/111345
Just commenting out the _block_rehash will work in the short term

Revision 1.16.4.6 - (view) (download) (as text) (annotate) - [select for diffs]
Sun May 27 06:27:50 2007 UTC (2 years, 6 months ago) by simon
Branch: DRUPAL-4-7
Changes since 1.16.4.5: +96 -13 lines
Diff to previous 1.16.4.5 , to branch point 1.16
Updating to match our local sources
Added jstools tab support for og pages.
Partial support for passing serial numbers around.
Lots of bug fixes.

Revision 1.20 - (view) (download) (as text) (annotate) - [select for diffs]
Sat Apr 14 22:53:41 2007 UTC (2 years, 7 months ago) by simon
Branch: MAIN
Changes since 1.19: +1 -1 lines
Diff to previous 1.19
Lots and lots of changes, this is just bringing them across to 5.x

Revision 1.19 - (view) (download) (as text) (annotate) - [select for diffs]
Sat Mar 17 00:56:57 2007 UTC (2 years, 8 months ago) by simon
Branch: MAIN
Changes since 1.18: +8 -5 lines
Diff to previous 1.18
Removed silly erp_base_path, changed things to do it the "right" way.
This should fix the problems with putting erp modules in sites/all.
Also fixed theme_add_style vs drupal_add_css problem

Revision 1.16.4.5 - (view) (download) (as text) (annotate) - [select for diffs]
Sat Mar 17 00:51:52 2007 UTC (2 years, 8 months ago) by simon
Branch: DRUPAL-4-7
Changes since 1.16.4.4: +8 -5 lines
Diff to previous 1.16.4.4 , to branch point 1.16
Removed silly erp_base_path, changed things to do it the "right" way.
This should fix the problems with putting erp modules in sites/all.
Also fixed theme_add_style vs drupal_add_css problem

Revision 1.18 - (view) (download) (as text) (annotate) - [select for diffs]
Fri Mar 9 22:17:15 2007 UTC (2 years, 8 months ago) by simon
Branch: MAIN
Changes since 1.17: +21 -21 lines
Diff to previous 1.17
More changes to work with 5.0 It doesn't kill my test install anymore,
but there are still quite a few things to be done.

Revision 1.17 - (view) (download) (as text) (annotate) - [select for diffs]
Fri Mar 9 07:16:07 2007 UTC (2 years, 8 months ago) by simon
Branch: MAIN
Changes since 1.16: +14 -4 lines
Diff to previous 1.16
All our updates from the drupal-4-7 branch imported across to head so that 5.0
development can restart.

Revision 1.16.4.4 - (view) (download) (as text) (annotate) - [select for diffs]
Mon Mar 5 11:09:00 2007 UTC (2 years, 8 months ago) by simon
Branch: DRUPAL-4-7
Changes since 1.16.4.3: +3 -1 lines
Diff to previous 1.16.4.3 , to branch point 1.16
Quite a few more small fixes

Revision 1.16.4.3 - (view) (download) (as text) (annotate) - [select for diffs]
Sat Mar 3 22:57:32 2007 UTC (2 years, 8 months ago) by simon
Branch: DRUPAL-4-7
Changes since 1.16.4.2: +3 -2 lines
Diff to previous 1.16.4.2 , to branch point 1.16
A lot of small tweaks/minor bugfixes

Revision 1.16.4.2 - (view) (download) (as text) (annotate) - [select for diffs]
Tue Jan 23 22:02:49 2007 UTC (2 years, 10 months ago) by simon
Branch: DRUPAL-4-7
Changes since 1.16.4.1: +10 -4 lines
Diff to previous 1.16.4.1 , to branch point 1.16
Lots of bugfixes, added new sms job notification

Revision 1.16.4.1 - (view) (download) (as text) (annotate) - [select for diffs]
Fri Jan 5 06:22:58 2007 UTC (2 years, 10 months ago) by simon
Branch: DRUPAL-4-7
Changes since 1.16: +1 -0 lines
Diff to previous 1.16
More polishing the store module
Bugfix in pricing module
Id in erp.inc

Revision 1.16 - (view) (download) (as text) (annotate) - [select for diffs]
Wed Dec 6 07:01:09 2006 UTC (2 years, 11 months ago) by simon
Branch: MAIN
Branch point for: DRUPAL-4-7, DRUPAL-5
Changes since 1.15: +1 -1 lines
Diff to previous 1.15
Small bugfixes for problems found in production

Revision 1.15 - (view) (download) (as text) (annotate) - [select for diffs]
Mon Dec 4 21:28:02 2006 UTC (2 years, 11 months ago) by simon
Branch: MAIN
Changes since 1.14: +5 -12 lines
Diff to previous 1.14
Masses of changes to get our live system back in sync with development version.

Revision 1.14 - (view) (download) (as text) (annotate) - [select for diffs]
Sun Oct 29 11:50:08 2006 UTC (3 years ago) by simon
Branch: MAIN
Changes since 1.13: +1 -1 lines
Diff to previous 1.13
Lots more cahnges to do with renaming nodes

Revision 1.13 - (view) (download) (as text) (annotate) - [select for diffs]
Mon Oct 23 14:22:12 2006 UTC (3 years, 1 month ago) by simon
Branch: MAIN
Changes since 1.12: +2 -2 lines
Diff to previous 1.12
Renaming modules to avoid namespace conflicts

Revision 1.12 - (view) (download) (as text) (annotate) - [select for diffs]
Sat Oct 21 12:34:44 2006 UTC (3 years, 1 month ago) by simon
Branch: MAIN
Changes since 1.11: +1 -1 lines
Diff to previous 1.11
Lots of changes moving the settings menu around, and starting to rename
things so that we don't have conflicts with ecommerce.

Revision 1.11 - (view) (download) (as text) (annotate) - [select for diffs]
Tue Aug 15 11:37:32 2006 UTC (3 years, 3 months ago) by simon
Branch: MAIN
Changes since 1.10: +0 -37 lines
Diff to previous 1.10
Made our own supplier list, not using views.
Lots of changes to get the timesheet module working again. This is needed for ongoing jobs.

Revision 1.10 - (view) (download) (as text) (annotate) - [select for diffs]
Wed Aug 9 07:17:33 2006 UTC (3 years, 3 months ago) by simon
Branch: MAIN
Changes since 1.9: +6 -6 lines
Diff to previous 1.9
Lots more changes

Revision 1.9 - (view) (download) (as text) (annotate) - [select for diffs]
Sun Jul 30 12:42:16 2006 UTC (3 years, 3 months ago) by simon
Branch: MAIN
Changes since 1.8: +17 -21 lines
Diff to previous 1.8
Masses of changes
Made themeing better
Made store module work, ready to get invoice etc details from it
Made use of nodeapi for loading things
Added erp section to user/my account with basic stats

Revision 1.8 - (view) (download) (as text) (annotate) - [select for diffs]
Thu Jul 27 08:05:39 2006 UTC (3 years, 4 months ago) by simon
Branch: MAIN
Changes since 1.7: +42 -15 lines
Diff to previous 1.7
Lots of changes and bugfixes to make installation easier.

Revision 1.7 - (view) (download) (as text) (annotate) - [select for diffs]
Sat Jul 22 11:42:51 2006 UTC (3 years, 4 months ago) by simon
Branch: MAIN
Changes since 1.6: +44 -0 lines
Diff to previous 1.6
Changed the way the pdf module works, added basic email module, added
ability to set invoice, purchase order etc numbers from settings.

Revision 1.6 - (view) (download) (as text) (annotate) - [select for diffs]
Fri Jul 21 13:16:43 2006 UTC (3 years, 4 months ago) by simon
Branch: MAIN
Changes since 1.5: +74 -1 lines
Diff to previous 1.5
Made invoice layout much nicer
Lots of changes with CSS as well

Revision 1.5 - (view) (download) (as text) (annotate) - [select for diffs]
Sun Jul 9 08:58:55 2006 UTC (3 years, 4 months ago) by simon
Branch: MAIN
Changes since 1.4: +11 -11 lines
Diff to previous 1.4
Lots of major changes.
Added a couple of new modules.

Revision 1.4 - (view) (download) (as text) (annotate) - [select for diffs]
Thu Jul 6 23:56:28 2006 UTC (3 years, 4 months ago) by simon
Branch: MAIN
Changes since 1.3: +30 -1 lines
Diff to previous 1.3
Some format function changes
Added images to cart functionality
Enhanced cart functionality
Resolved bug when editing and invoice or quote with more than 5 line items

Revision 1.3 - (view) (download) (as text) (annotate) - [select for diffs]
Wed Apr 26 12:12:46 2006 UTC (3 years, 7 months ago) by simon
Branch: MAIN
Changes since 1.2: +1 -2 lines
Diff to previous 1.2
Recent changes to the "asset" module

Revision 1.2 - (view) (download) (as text) (annotate) - [select for diffs]
Tue Apr 25 01:15:03 2006 UTC (3 years, 7 months ago) by simon
Branch: MAIN
Changes since 1.1: +3 -0 lines
Diff to previous 1.1
Masses of changes

Revision 1.1 - (view) (download) (as text) (annotate) - [select for diffs]
Sat Apr 8 01:09:53 2006 UTC (3 years, 7 months ago) by simon
Branch: MAIN
Re-committing into the "module" section, instead of my sandbox as there
has been some interest from others.

These modules are still not in production use, and are under heavy
development. Help appreciated ;-)

This form allows you to request diffs between any two revisions of this file. For each of the two "sides" of the diff, select a symbolic revision name using the selection box, or choose 'Use Text Field' and enter a numeric revision.

  Diffs between and
  Type of Diff should be a

Sort log by:

  ViewVC Help
Powered by ViewVC 1.1.2