Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2026-02-02 22:33:36 +01:00
Code Issues Packages Projects Releases Wiki Activity
43,696 Commits 38 Branches 191 Tags
f1f4fc18e9caf36ea46edcdc8da141edf12f9193
Commit Graph

37572 Commits

Author SHA1 Message Date
Regis Houssin
f1f4fc18e9 Fix: use "doc" instead "pdf" dir and uniformize code 2014-09-29 11:08:50 +02:00
Regis Houssin
4124ee6bc4 Fix: add model_pdf in fetch of contract object 2014-09-29 10:28:10 +02:00
Regis Houssin
f233d4f610 New: add doc models management in contract module 2014-09-28 20:39:02 +02:00
Laurent Destailleur
27d42aa9a4 Fix: On peruser view, fullday event are reported. 
Fix: On peruser view, can start from hour 0.
 2014-09-28 16:54:42 +02:00
Laurent Destailleur
06494b085a Perf enhancement 2014-09-28 16:38:45 +02:00
Laurent Destailleur
cd4c81d15d Uniformize code. 2014-09-28 16:31:37 +02:00
Laurent Destailleur
2b95bd2fcc Fix: Link to linked object was not working for invoice and order. 
Fix: end date
 2014-09-28 16:12:38 +02:00
Laurent Destailleur
eea034e0e5 Fix: 1 second missing into lastdaytoshow. 2014-09-28 15:33:13 +02:00
Laurent Destailleur
a760fca08c Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2014-09-28 14:18:23 +02:00
Laurent Destailleur
52340e9176 Fix: Missing fields into select 2014-09-28 14:18:04 +02:00
Regis Houssin
f527602753 Fix: use specific css style instead, this causes a shift problem 2014-09-28 13:12:51 +02:00
Regis Houssin
0997a7960d Fix: uniformize code 2014-09-28 12:53:06 +02:00
Laurent Destailleur
ec95aacd52 Uniformize code for error reporting after a hook. 2014-09-28 03:41:32 +02:00
Laurent Destailleur
4244979f4f Fix: doxygen 
Fix: td balance
 2014-09-28 02:46:20 +02:00
Laurent Destailleur
14ab409ca9 Merge remote-tracking branch 'origin/3.6' into develop 
Conflicts:
	htdocs/admin/stock.php
	htdocs/admin/system/index.php
	htdocs/comm/fiche.php
	htdocs/core/lib/admin.lib.php
	htdocs/core/lib/holiday.lib.php
	htdocs/core/lib/pdf.lib.php
	htdocs/core/login/functions_forceuser.php
	htdocs/core/login/functions_http.php
	htdocs/core/menus/standard/auguria.lib.php
	htdocs/core/modules/livraison/pdf/pdf_typhon.modules.php
	htdocs/filefunc.inc.php
	htdocs/holiday/define_holiday.php
	htdocs/opensurvey/fonctions.php
	htdocs/societe/canvas/actions_card_common.class.php
	test/phpunit/CompanyBankAccountTest.php
	test/phpunit/ExportTest.php
	test/phpunit/FactureTest.php
	test/phpunit/FunctionsLibTest.php
	test/phpunit/PropalTest.php
	test/phpunit/SocieteTest.php
	test/phpunit/WebservicesInvoicesTest.php
	test/phpunit/WebservicesThirdpartyTest.php
 2014-09-28 02:14:32 +02:00
Laurent Destailleur
5fdd798e91 Fix: phpcheckstyle from phpcs 1.5.5 (closing tags and & char on 
parameter).
 2014-09-27 17:13:15 +02:00
Laurent Destailleur
e8b7c9c6bd Fix: doxygen 2014-09-27 16:00:11 +02:00
Laurent Destailleur
e1ba6ccfc6 Merge branch '3.6' of git@github.com:Dolibarr/dolibarr.git into 3.6 2014-09-27 14:51:41 +02:00
Laurent Destailleur
b8969edcc5 Prepare 3.6.1 2014-09-27 12:34:45 +02:00
Laurent Destailleur
a3436135c9 Merge remote-tracking branch 'origin/3.6' into develop 
Conflicts:
	htdocs/projet/activity/list.php
 2014-09-26 13:34:31 +02:00
Laurent Destailleur
722e939e19 Fix: form must not be into a closing and opening tr tag. 2014-09-26 13:23:54 +02:00
Laurent Destailleur
8e95f2e223 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2014-09-26 12:42:41 +02:00
Laurent Destailleur
c0e93a17da Add FIXME 2014-09-26 12:42:21 +02:00
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
Regis Houssin
3ab8b6f7d1 New: add possibility to define a custom error message 2014-09-26 09:44:21 +02:00
Regis Houssin
44cecb8e7d Fix: add possibility to use element id 2014-09-26 09:20:02 +02:00
Regis Houssin
179da9a220 Fix: uniformize code 2014-09-25 13:50:01 +02:00
Regis Houssin
64b757ed81 Fix: add generic doc and use doc dir instead pdf 2014-09-25 12:44:57 +02:00
Regis Houssin
3daf06960d Fix: add generic doc and uniformize code 2014-09-25 12:07:11 +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
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
Raphaël Doursenaud
634d5aa549 FIX: double header 2014-09-23 19:35:45 +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
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