Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-06 09:38:23 +01:00
Code Issues Packages Projects Releases Wiki Activity
61,071 Commits 36 Branches 190 Tags
8f34de1036680906ebdb8c05e6460077b5dc4b43
Commit Graph

773 Commits

Author SHA1 Message Date
Laurent Destailleur
a886136e67 More comment and add a unit test to check that {t} tag is correctly 
supported.
 2015-01-13 22:13:15 +01:00
Laurent Destailleur
31fd03790e Fixed: Prices visible into stock tab. 
Conflicts:
	htdocs/product/stock/product.php
 2015-01-12 18:26:11 +01:00
Laurent Destailleur
1d2c8bbd4d Fixed: Prices visible into stock tab. 2015-01-12 18:16:24 +01:00
Laurent Destailleur
fc78d632d3 Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	htdocs/compta/facture.php
	htdocs/contrat/class/contrat.class.php
	htdocs/core/lib/company.lib.php
	htdocs/core/lib/functions.lib.php
	htdocs/main.inc.php
 2015-01-09 23:09:10 +01:00
frederic34
73fda2cb86 WIP PSR2 2015-01-08 18:36:03 +01:00
Laurent Destailleur
c0b5b9f00b Fixed: Removed deprecated function 2015-01-04 19:26:51 +01:00
Laurent Destailleur
e395fd8096 Fix CRLF 2014-11-30 15:24:39 +01:00
Laurent Destailleur
491aef72e0 More phpunit tests 2014-11-28 00:56:21 +01:00
Laurent Destailleur
f7552c83d2 Fix: Must ignore such fields 2014-10-30 17:50:34 +01:00
Laurent Destailleur
13590a876b Fix: A little clean of dol_hash usage. 2014-10-18 16:08:15 +02:00
Laurent Destailleur
f498921715 Merge branch 'droposcommerce' of github.com:GPCsolutions/dolibarr into 
GPCsolutions-droposcommerce

Conflicts:
	htdocs/install/mysql/migration/3.6.0-3.7.0.sql
	htdocs/langs/vi_VN/admin.lang
	htdocs/langs/vi_VN/shop.lang
 2014-10-13 00:50:51 +02:00
Laurent Destailleur
591b40e674 Some fix with export definition. Works now with pgql too. 2014-10-12 01:59:21 +02:00
Laurent Destailleur
a804fe62b4 Fix: translation for vi_VN 2014-10-11 15:46:37 +02:00
Laurent Destailleur
97eec37f1c Uniformize code: property "nom" for thirdparty is aliased into "name" 
everywhere.
 2014-10-04 17:20:17 +02:00
Raphaël Doursenaud
f01e76f686 Removed unmaintaned OScommerce module 2014-09-29 15:22:48 +02:00
Regis Houssin
f1f4fc18e9 Fix: use "doc" instead "pdf" dir and uniformize code 2014-09-29 11:08:50 +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
dad82fa1fa Fix: bad phpunit test case 2014-09-24 01:36:12 +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
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
aspangaro
9220419409 Merge remote-tracking branch 'Upstream/develop' into develop 2014-09-21 20:45:41 +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
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
aspangaro
1592968709 Merge remote-tracking branch 'Upstream/develop' into develop 2014-09-20 06:42:31 +02:00
Laurent Destailleur
b252680346 Add phpunit for interventions 2014-09-20 01:10:55 +02:00
Laurent Destailleur
ad8b92541d Fix: sql request with pgsql 
Fix: bug reported by scrutinizer
Doxygen
Start to work on multi user assigned to an event.
 2014-09-20 00:57:29 +02:00
aspangaro
0b20369dd7 Qual: Renamed all files & links "fiche.php" into "card.php" 2014-09-18 21:18:25 +02:00
Marcos García de La Fuente
9ae7486555 Removed deprecated usage of supplier_order_pdf_create and supplier_invoice_pdf_create 2014-09-16 21:42:07 +02:00
Marcos García de La Fuente
3561c8e6f3 Removed deprecated usage of propale_pdf_create 2014-09-16 20:57:17 +02:00
Marcos García de La Fuente
9dbf054026 Removed deprecated usage of project_pdf_create 2014-09-16 20:53:43 +02:00
Marcos García de La Fuente
4b3191b64e Removed deprecated usage of facture_pdf_create 2014-09-16 20:49:05 +02:00
Marcos García de La Fuente
610dc8cd0c Removed deprecated usage of expedition_pdf_create 2014-09-16 20:38:28 +02:00
Marcos García de La Fuente
c195c6fd10 Removed deprecated usage of commande_pdf_create 2014-09-16 20:35:31 +02:00
Laurent Destailleur
342e26f679 Merge 2014-09-07 12:22:04 +02:00
Laurent Destailleur
6d9cc15856 Fix: Function unaccent was not enough complete. 2014-09-06 14:40:43 +02:00
Laurent Destailleur
e3f96802fb Fix: sql bad use. 
Qual: Incrase sql syntax test by phpunit to migration scripts. 
Qual: Removed old migration script before 3.0.0
 2014-08-14 00:09:09 +02:00
Laurent Destailleur
35d2e4f84c Merge remote-tracking branch 'origin/3.6' into develop 2014-08-06 10:30:58 +02:00
Laurent Destailleur
230b1d4bb8 Merge remote-tracking branch 'origin/3.5' into 3.6 
Conflicts:
	test/phpunit/SqlTest.php
 2014-08-06 10:28:37 +02:00
Laurent Destailleur
a430534768 Merge remote-tracking branch 'origin/3.4' into 3.5 2014-08-06 10:22:34 +02:00
Laurent Destailleur
96a4aa2d26 Fix: phpunit 2014-08-01 01:31:52 +02:00
Laurent Destailleur
8e5cbb1f6c Merge branch 'patch-2' of github.com:marcosgdf/dolibarr into 
marcosgdf-patch-2

Conflicts:
	test/phpunit/Functions2LibTest.php
 2014-07-31 17:21:46 +02:00
Marcos García de La Fuente
972d3c69b6 Removed duplicated requires. 
Json.lib.php is included with functions.lib.php
 2014-07-30 15:42:58 +02:00
Marcos García de La Fuente
42c7fc1c8d Revert "Testing dol_json_encode is not interesting now as it uses a core function" 2014-07-30 15:19:31 +02:00
Laurent Destailleur
36c4d272e7 Fix: phpunit test 2014-07-30 08:45:10 +02:00
Marcos García de La Fuente
5baf48fc15 Revert "Removed empty test" 
This reverts commit cf1a2c44a3.
 2014-07-26 19:12:11 +02:00
Laurent Destailleur
3b9cfea8c9 Better function is_ip 2014-07-26 14:16:09 +02:00
Laurent Destailleur
8f6023ab5f Fix: phpunit test 2014-07-26 14:07:37 +02:00