Commit Graph

43662 Commits

Author SHA1 Message Date
Laurent Destailleur
bf4b99fa64 Assignation of event to several users is on a very good way for 3.7 2014-09-26 12:27:18 +02:00
Laurent Destailleur
396bae21d6 Fix: Missing closing tr 2014-09-24 18:15:20 +02:00
Laurent Destailleur
cff713ad07 Fix: var not initialized 2014-09-24 17:43:38 +02:00
Laurent Destailleur
53e1bb8615 Merge pull request #1922 from fmarcet/develop
New: Added hook "formConfirm" and "doActions" for fichinter card
2014-09-24 17:41:56 +02:00
Laurent Destailleur
c2cbbffd12 Fix: duplicate field 2014-09-24 17:30:49 +02:00
fmarcet
63c6bd5d17 New: Added hook "formConfirm" and "doActions" for fichinter card 2014-09-24 13:28:59 +02:00
Laurent Destailleur
cdca651ded Doxygen.
Ad field color
2014-09-24 01:40:16 +02:00
Laurent Destailleur
dad82fa1fa Fix: bad phpunit test case 2014-09-24 01:36:12 +02:00
Laurent Destailleur
a4d8739477 Qual: Clean a lot of deprecated code 2014-09-24 01:35:29 +02:00
Laurent Destailleur
d6385fe1cc Merge pull request #1917 from atm-alexis/feature_add_clone_to_social_contribution
add the clone action for a social contribution
2014-09-24 01:16:27 +02:00
Laurent Destailleur
40c1b02a6c Correction repair.sql 2014-09-24 01:15:34 +02:00
Laurent Destailleur
f6445f9cef Fix: Pb into repair function 2014-09-24 00:51:36 +02:00
Laurent Destailleur
74cba062b4 Add a TODO to explain why we keep some extends into class.
Should be removed once php min will be 5.4.
2014-09-23 19:37:59 +02:00
Laurent Destailleur
dd86453020 Add field color into table of type of events 2014-09-23 17:54:03 +02:00
Alexis Algoud
691658cde3 add the clone action for a social contribution
- With option to clone it to the next month by default
2014-09-23 16:52:15 +02:00
Laurent Destailleur
7224f64224 Work on multi user for events.
Fix: Modules must be reloaded after migration.
2014-09-23 16:15:15 +02:00
Laurent Destailleur
640bf7c34b Uniformize field name 2014-09-23 12:18:42 +02:00
Laurent Destailleur
aba4c90d2b Trans 2014-09-23 11:23:57 +02:00
Laurent Destailleur
65a486a48b Merge pull request #1897 from Cubexed/develop-patch-2
Closed projects are greyed out in project selector
2014-09-23 00:08:46 +02:00
Laurent Destailleur
7bf922c8d6 Merge branch 'marcosgdf-oop-pdf' into develop 2014-09-23 00:02:43 +02:00
Laurent Destailleur
dc96e10215 Merge branch 'oop-pdf' of github.com:marcosgdf/dolibarr into
marcosgdf-oop-pdf

Conflicts:
	htdocs/projet/class/project.class.php
2014-09-23 00:02:19 +02:00
Laurent Destailleur
bd6afa10ed Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2014-09-22 23:57:46 +02:00
Laurent Destailleur
4ff6b1ab1a Merge branch 'KreizIT-predefined' into develop
Conflicts:
	ChangeLog
2014-09-22 23:57:12 +02:00
Laurent Destailleur
d0da5ef047 Merge pull request #1910 from FHenry/develop
Better accountancy auto find accountancy code feature (work with several
2014-09-22 23:48:32 +02:00
Laurent Destailleur
e1fec958ef Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop

Conflicts:
	htdocs/user/group/fiche.php
2014-09-22 23:43:22 +02:00
Laurent Destailleur
d1136beef1 Merge branch 'aspangaro-develop' into develop 2014-09-22 23:39:48 +02:00
Laurent Destailleur
e163b0237f Merge branch 'develop' of github.com:aspangaro/dolibarr into
aspangaro-develop

Conflicts:
	htdocs/fichinter/card.php
2014-09-22 23:39:26 +02:00
Laurent Destailleur
08d4195504 Merge branch 'develop' of github.com:aspangaro/dolibarr into
aspangaro-develop

Conflicts:
	htdocs/fichinter/card.php
2014-09-22 23:34:56 +02:00
Laurent Destailleur
b73fe26d6e Merge pull request #1913 from atm-alexis/feature_extrafields_on_group
ADD extrafields on usergroup
2014-09-22 23:24:52 +02:00
Laurent Destailleur
469ff4320a Uniformize export profiles. 2014-09-22 21:46:46 +02:00
Laurent Destailleur
f7f0059767 Missing hook to add button on intervention
Prepare to move location into resource
Can select which king of contact show into contact tab.
2014-09-22 20:16:58 +02:00
Alexis Algoud
de0d53a2bb ADD extrafields on usergroup 2014-09-22 16:31:58 +02:00
Marcos García de La Fuente
8f492a6677 Documented commonObject::commonGenerateDocument 2014-09-22 00:18:36 +02:00
Marcos García de La Fuente
016c889aa8 Refactored CommandeFournisseur::generateDocument and FactureFournisseur::generateDocument 2014-09-22 00:15:32 +02:00
Marcos García de La Fuente
9244ef23af Removed 2nd argument of muscadet and canelle model __construct function 2014-09-22 00:08:21 +02:00
Marcos García de La Fuente
8e1f9c8d70 Added missing function in Expedition::generateDocument 2014-09-22 00:07:10 +02:00
aspangaro
9220419409 Merge remote-tracking branch 'Upstream/develop' into develop 2014-09-21 20:45:41 +02:00
aspangaro
4b4fe9811f Changelog 2014-09-21 20:43:06 +02:00
aspangaro
1bcc2c92a3 compta_mode -> accounting_mode 2014-09-21 20:42:46 +02:00
aspangaro
e147259e95 Renamed all constants COMPTA_* into ACCOUNTING_* and migration of module ACCOUNTINGEX 3.6 2014-09-21 20:30:55 +02:00
Laurent Destailleur
cec7464410 Fix: case into phpunit test case 2014-09-21 20:13:38 +02:00
Marcos García de La Fuente
13f91a645c Fixed syntax error problem 2014-09-21 19:07:01 +02:00
Marcos García de La Fuente
e97a84102b Fixed syntax error in commande document generation 2014-09-21 18:49:44 +02:00
Marcos García de La Fuente
bf7f4c1cab Refactored generateDocument functions 2014-09-21 18:16:14 +02:00
Marcos García de La Fuente
ca9e33e809 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into oop-pdf 2014-09-21 18:00:56 +02:00
Florian HENRY
3602155c5e Fix FicheInterTest Call 2014-09-20 10:28:59 +02:00
Florian HENRY
119be5da42 Better ressource management on project and task 2014-09-20 10:14:26 +02:00
Florian HENRY
565de5258f Re-Add subtotal line on compta report (accidentaly remove before) 2014-09-20 09:19:26 +02:00
Florian HENRY
7aecce526a Better accountancy auto find accountacty code feature (work with several
accountacy plan)
2014-09-20 09:11:50 +02:00
aspangaro
1592968709 Merge remote-tracking branch 'Upstream/develop' into develop 2014-09-20 06:42:31 +02:00