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

45118 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
05f83dddf0 Fix: packager 2014-09-27 15:23:40 +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
7dcaa61218 Prepare 3.6.1 2014-09-27 13:23:38 +02:00
Laurent Destailleur
b8969edcc5 Prepare 3.6.1 2014-09-27 12:34:45 +02:00
Florian HENRY
96c5771718 Fix web service category 2014-09-26 16:18:32 +02:00
Florian HENRY
249d37a093 Merge branch '3.6' of git@github.com:Dolibarr/dolibarr.git into 3.6 2014-09-26 13:52:04 +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
jean
16facc81aa Add link with order when invoice made for a shioppoing 2014-09-26 10:11:38 +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
jean
82a2bb1690 list bof orders to process : status validated or in process, or closed 
but not billed
 2014-09-25 17:00:44 +02:00
Regis Houssin
179da9a220 Fix: uniformize code 2014-09-25 13:50:01 +02:00
fmarcet
7b9f154c29 Fix: Withdrawal total amount is double 2014-09-25 12:45:08 +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
Florian HENRY
3bc227b467 Fix for travis syntax 2014-09-25 10:25:15 +02:00
jean
e9374e8c08 adding hook for addMoreActionsbuttons 2014-09-25 09:26:32 +02:00
jean
6149994b43 Adding hook 'suppliercard' on supplier cartd 2014-09-24 22:05:53 +02:00
Laurent Destailleur
396bae21d6 Fix: Missing closing tr 2014-09-24 18:15:20 +02:00
Laurent Destailleur
959d463fc5 Merge pull request #1921 from altairis-fr/clone_extra 
FIX: clone line extrafields value on quote, order and invoice
 2014-09-24 17:44:49 +02:00
Laurent Destailleur
cff713ad07 Fix: var not initialized 2014-09-24 17:43:38 +02:00
Raphaël Doursenaud
f7aa08f3fd Fixed invoices webservice 2014-09-24 17:42:05 +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
Christophe Battarel
2c52de3840 fix missing "," 2014-09-24 12:12:10 +02:00
Christophe Battarel
d1868b643e FIX: clone line extrafields value on quote, order and invoice 2014-09-24 11:47:34 +02:00
Florian HENRY
14ca936cfc set ref_supplier for contract field 2014-09-24 10:21:26 +02:00
Florian HENRY
f9fb73ee82 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2014-09-24 10:04:01 +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
12d15cce9f Merge pull request #1919 from GPCsolutions/fixtimespent 
FIX: double header
 2014-09-24 01:16:08 +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