lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
109,623 Commits 43 Branches 150 Tags 886 MiB
develop
Commit Graph

140 Commits

Author SHA1 Message Date
fhenry
0427080a4e Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into 
develop_orderextrafield

Conflicts:
	htdocs/install/mysql/migration/3.3.0-3.4.0.sql

Change-Id: I91fe24831dca9e1d9e6b09f85dd4b7bd37bd638e
 2013-04-07 15:11:52 +02:00
fhenry
144ab24545 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into 
develop

Conflicts:
	htdocs/install/mysql/migration/3.3.0-3.4.0.sql

Change-Id: I51b110ec2c087110ab6080d1e754438ce83bd9cd
 2013-04-07 15:08:47 +02:00
simnandez
7b70fc4bf3 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop

Conflicts:
	htdocs/install/mysql/migration/3.3.0-3.4.0.sql
 2013-04-07 14:30:44 +02:00
Laurent Destailleur
88858136fc New: Enhance agenda module to reach RFC2445 (add busy information). 2013-04-06 17:39:31 +02:00
Laurent Destailleur
d863a0b1bd Fix: syntax error 2013-04-06 16:21:34 +02:00
fhenry
48b510dd45 Same bug fixing 2013-04-06 12:42:54 +02:00
fhenry
cc465380da Fix upgrade bug (llx_printer_ipp) wrong syntax (my fault, sorry) 2013-04-06 12:20:19 +02:00
fhenry
b7137606ee Merge branch 'develop' into develop_orderextrafield 
Conflicts:
	htdocs/commande/fiche.php
	htdocs/install/mysql/migration/3.3.0-3.4.0.sql

Change-Id: If57a2f2a386a2903b976178eb63aef2c8b09473d
 2013-04-06 10:41:29 +02:00
simnandez
50548601ce Resolve conflicts 2013-04-06 08:20:57 +02:00
Laurent Destailleur
adf47d6975 Qual: Uniformise columns 2013-04-06 00:34:33 +02:00
fhenry
dfcb38d13f [ task #793 ] Add extrafield feature into Orders module 2013-04-05 12:43:00 +02:00
fhenry
dcd960a957 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into 
develop

Conflicts:
	htdocs/install/mysql/migration/3.3.0-3.4.0.sql

Change-Id: I2196e69ebae5a057eb6df018b683ff35f721ead9
 2013-04-05 11:46:09 +02:00
Laurent Destailleur
58bb2df24c Qual: Uniformize columns 2013-04-04 20:58:42 +02:00
fhenry
c109467d20 Qual : Review code after intalling PHPUnit, CodeSniffer on Eclipse... 2013-04-04 13:58:33 +02:00
fhenry
ae00d8b214 Add import_key into llx_product_price 2013-04-02 15:03:01 +02:00
Grand Philippe
e2623c6ad5 try to fix :supplier invoice numbering 2013-04-01 16:04:15 +02:00
Laurent Destailleur
cc69cf7b76 New: Can defined a clicktodial setup per user 2013-03-31 16:44:24 +02:00
Grand Philippe
f57320e697 add numbering for supplier invoice 2013-03-29 15:36:54 +01:00
Laurent Destailleur
fbf8d410d2 New: Support revenue stamp onto invoices 2013-03-23 17:34:23 +01:00
Laurent Destailleur
e4ae70b5b2 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into 
develop

Conflicts:
	htdocs/install/mysql/migration/3.3.0-3.4.0.sql
 2013-03-22 17:21:57 +01:00
Laurent Destailleur
350bcea183 Merge 2013-03-22 17:10:17 +01:00
Laurent Destailleur
2ec462dcf4 Fix: [ task #771 ] harmonize length of zipcode 
New: Add personal address for users.
 2013-03-22 17:00:55 +01:00
fhenry
0215031632 [ task #122 ] Create a scheduled cron module 2013-03-22 14:45:20 +01:00
Grand Philippe
cb23777469 fix sql error 2013-03-20 22:21:22 +01:00
Laurent Destailleur
a2763df9e7 Qual: Start to clean the simple accountancy moule. 2013-03-20 21:41:16 +01:00
Laurent Destailleur
257f6da8f4 New: Add field to make accountancy dispatch module easier to build. 
Must match module customer invoice.
 2013-03-20 20:34:30 +01:00
Grand Philippe
fb75358c10 fix: deprecated for expedition_methode_id 2013-03-18 17:34:29 +01:00
eldy
1d09e122c0 Some debug with pgsql 2013-03-17 14:28:57 +01:00
Grand Philippe
e1baf806b9 change birth instead of naiss 2013-03-13 22:17:03 +01:00
jfefe
ba8525bd6a Merge branch 'develop' of git://github.com/Dolibarr/dolibarr into extrafields 
Conflicts:
	htdocs/install/doctemplates/invoices/template_invoice.odt
	htdocs/install/doctemplates/proposals/template_proposal.odt
	htdocs/install/mysql/migration/3.3.0-3.4.0.sql
 2013-03-11 05:21:35 +01:00
Laurent Destailleur
60f16e1a88 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop

Conflicts:
	htdocs/install/mysql/migration/3.3.0-3.4.0.sql
 2013-03-09 19:06:53 +01:00
Laurent Destailleur
3e5ee3b00a Fix: PHPUnit tests are back. 2013-03-09 18:55:57 +01:00
Laurent Destailleur
e03487f865 Merge pull request #724 from KreizIT/develop 
Add trigger BILL_UNVALIDATE when invoice is unvalidate
 2013-03-09 09:55:29 -08:00
Cedric GROSS
d16691c856 Add trigger BILL_UNVALIDATE when invoice is unvalidate 2013-03-09 17:38:35 +01:00
Laurent Destailleur
418eeef8b4 Fix: Ton of bugs into renaming fields 2013-03-09 16:19:15 +01:00
Laurent Destailleur
01b2a6a79b Prepare database for more localtax types. 2013-03-09 13:12:20 +01:00
Laurent Destailleur
2a67af3c94 New: when adding an action, we can define a free code to tag it for 
a specific need.
 2013-03-08 12:04:01 +01:00
jfefe
1690c77aa2 Merge branch 'extra_invoice' into extrafields 
Conflicts:
	htdocs/install/mysql/migration/3.3.0-3.4.0.sql
 2013-03-07 01:48:27 +01:00
eldy
e74b07cbff Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop

Conflicts:
	htdocs/install/mysql/migration/3.3.0-3.4.0.sql
 2013-03-06 21:28:50 +01:00
eldy
05c6706727 Fix: error with pgsql 2013-03-06 20:08:38 +01:00
Grand Philippe
a080021511 fix : deprecated 2013-03-06 17:17:34 +01:00
Laurent Destailleur
d92fd0eaed New: Add table, dictionnary and option to enable "revenue stamp". 2013-03-06 16:09:00 +01:00
Laurent Destailleur
0bfa968a3f New: Add field to store revenue stamp 2013-03-06 15:44:06 +01:00
jfefe
49f1ef173a Add table for invoice extrafields 2013-03-06 03:17:38 +01:00
jfefe
f335c4f306 New : add extrafield support on propal object 2013-03-04 18:22:25 +01:00
Laurent Destailleur
fc46a02573 Fix: Uniformize field type 2013-03-02 16:39:26 +01:00
Grand Philippe
44683a0e21 english language standardization 2013-02-27 11:58:50 +01:00
Grand Philippe
6fb6b916c7 english language standardization 2013-02-27 11:24:50 +01:00
Laurent Destailleur
6f0c35ef61 Fix: Bad migration instruct 2013-02-26 22:57:01 +01:00
philippe
905d6f7b71 Merge branch 'develop' of git://github.com/Dolibarr/dolibarr.git into develop 2013-02-26 08:22:48 +01:00
Laurent Destailleur
c44f6004dd Doc 2013-02-25 20:17:41 +01:00
Grand Philippe
79c2e17cbb english language standardization 2013-02-25 17:56:41 +01:00
Grand Philippe
cb28300d7e fix error commit 2013-02-24 17:17:25 +01:00
philippe
43b01010d1 Merge branch 'develop' of git://github.com/Dolibarr/dolibarr.git into develop 2013-02-24 17:09:12 +01:00
Grand Philippe
86de772b31 english language standardization 2013-02-24 17:08:52 +01:00
Laurent Destailleur
7aca87ea40 Merge pull request #690 from frederic34/develop 
WIP : Carrier Admin sql data migration
 2013-02-24 07:45:44 -08:00
Grand Philippe
dfae543d5e english language standardization 2013-02-24 15:57:02 +01:00
Grand Philippe
36ce7a9a10 some fix for english language standardization 2013-02-24 14:11:09 +01:00
frederic34
2a2719d5eb WIP : Carrier Admin sql data migration 2013-02-23 16:54:41 +01:00
Laurent Destailleur
4dbf5a20ad Merge pull request #687 from frederic34/develop 
WIP : Admin for Carriers
 2013-02-23 07:38:55 -08:00
Grand Philippe
382d216d54 english language standardization 2013-02-23 15:58:26 +01:00
Grand Philippe
b699b79a15 english language standardization 2013-02-23 15:36:12 +01:00
Grand Philippe
f862adc4d9 Merge branch 'develop' of git://github.com/Dolibarr/dolibarr into develop 2013-02-23 15:27:06 +01:00
Grand Philippe
a237be0d24 english language standardization 2013-02-23 15:26:39 +01:00
frederic34
9333fdb97f WIP : Admin for Carriers 2013-02-23 15:23:33 +01:00
Laurent Destailleur
37b94e43c8 Merge pull request #685 from frederic34/develop 
WIP : Admin for Carriers
 2013-02-23 03:11:52 -08:00
Grand Philippe
15f8b588d6 english standardization 2013-02-23 11:54:46 +01:00
Grand Philippe
250a941096 english standardization 2013-02-23 11:11:33 +01:00
frederic34
c8872d7e98 WIP : Admin for carriers 2013-02-23 10:20:31 +01:00
Grand Philippe
57a75d9882 english standardization 2013-02-22 17:15:49 +01:00
Grand Philippe
fb54bceafb english standardization 2013-02-22 16:53:50 +01:00
Grand Philippe
890b9ca44a english standardization 2013-02-22 16:27:58 +01:00
Grand Philippe
a582fd3f15 english standardization 2013-02-22 16:14:52 +01:00
Grand Philippe
fc4ad12a72 english standardization 2013-02-22 15:57:30 +01:00
frederic34
67c06225a5 WIP : Admin for carriers 2013-02-22 14:18:51 +01:00
Grand Philippe
19201a1015 english standardization 2013-02-22 11:32:19 +01:00
Grand Philippe
d255dc5114 english standardization 2013-02-22 10:24:24 +01:00
Grand Philippe
0af5c434af english standardization 2013-02-22 09:29:34 +01:00
frederic34
de4bc7f39d Fix : It was a bad idea to add COL in the code name of new carriers 2013-02-22 08:56:14 +01:00
frederic34
d7f83c3520 New: Add some carrier 2013-02-21 11:23:12 +01:00
Laurent Destailleur
2852aded3a New: Add button collapse/expand for menu, category and user views. 2013-02-20 21:16:31 +01:00
Laurent Destailleur
9f8ffe242a Fix: A text field can not have a default value 2013-02-17 16:26:06 +01:00
Laurent Destailleur
aa8413d7cb Fix: Missing migration 
Fix: Error management
 2013-02-17 16:20:49 +01:00
jfefe
14f21bc9f1 Add select list in extrafields type 2013-02-15 00:17:42 +01:00
Laurent Destailleur
caec1429b1 Fix: Uniformize database type according to page http:// 2013-02-13 15:19:03 +01:00
Christophe Battarel
5c9950f486 prepare db for margin on contracts 2013-02-13 08:55:16 +01:00
Laurent Destailleur
7ee530f826 New: Add field to store hierarchy of users. 2013-01-30 15:23:49 +01:00
Laurent Destailleur
c2d334624b Qual: Simplify system for menu manager. Only one file, one class per 
manager.
 2013-01-25 17:44:23 +01:00
fhenry
e3fd60c762 Add adherent type extrafield extrafield table in migration script 2013-01-16 13:49:44 +01:00
Laurent Destailleur
ec8b260bf6 New: Prepare 3.4 branch 
New: Add hook for agenda, info and category tabs
 2013-01-12 14:34:16 +01:00