lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
55,549 Commits 43 Branches 150 Tags 886 MiB
49e54d55d5
Commit Graph

602 Commits

Author SHA1 Message Date
Laurent Destailleur
3b595f0247 Merge remote-tracking branch 'origin/3.8' into develop 
Conflicts:
	htdocs/accountancy/bookkeeping/list.php
	htdocs/accountancy/customer/list.php
	htdocs/accountancy/journal/bankjournal.php
	htdocs/core/lib/date.lib.php
	htdocs/core/lib/report.lib.php
	htdocs/langs/en_US/accountancy.lang
 2015-12-13 16:23:33 +01:00
Laurent Destailleur
4b741c6b9c Fix permissions 2015-12-13 16:16:30 +01:00
Laurent Destailleur
a462cd232d Merge remote-tracking branch 'origin/3.7' into 3.8 2015-12-13 16:09:09 +01:00
Laurent Destailleur
4a88c9ea9f Merge remote-tracking branch 'origin/3.6' into 3.7 
Conflicts:
	htdocs/product/class/product.class.php
 2015-12-13 15:53:57 +01:00
Raphaël Doursenaud
c0862762a5 Fix #3930 Removed executable bit 
These files doesn't contain executable code and may pose a security
threat.
 2015-12-09 13:28:36 +01:00
Laurent Destailleur
5d5cfd498a Add holiday date functions into PHPUnit 2015-11-28 19:54:16 +01:00
Laurent Destailleur
7f75a3da9d NEW On list of thirdparties, user can select fields to show. 
Make phpunit test working again localy.
Add missing columns into llx_expedition.
 2015-10-15 03:29:35 +02:00
Laurent Destailleur
e22b0b9a57 More complete PHPunit test 2015-10-14 22:36:32 +02:00
Raphaël Doursenaud
b785db86a8 Fix unittests regression 
Introduced by incomplete renaming
of modSyncSupplierWebServices to modWebServicesClient
in 4b103ba8ce
 2015-10-09 19:02:44 +02:00
Juanjo Menent
86a201edcf Merge pull request #3595 from GPCsolutions/note 
[Qual] Do not test deprecated update_note_public()
 2015-09-26 08:46:51 +02:00
Raphaël Doursenaud
bd7d487c79 [Qual] Do not test deprecated update_note_public() 2015-09-24 20:52:43 +02:00
Raphaël Doursenaud
9f2545b95d [Qual] Replaced deprecated dol_clone by native clone 2015-09-24 17:24:40 +02:00
Laurent Destailleur
25e729cf4d Revert "Fix #3322 Use title for alt if no alt is provided" 
This reverts commit 2cf9d9f583.
 2015-08-12 23:18:07 +02:00
Juanjo Menent
761c50a885 Merge remote-tracking branch 'origin/3.7' into 3.8 2015-08-06 18:22:29 +02:00
Raphaël Doursenaud
2cf9d9f583 Fix #3322 Use title for alt if no alt is provided 
alt has priority over title, so it should be filled if title is filled.
Use the title value to fill alt.
Unit test updated accordingly.
 2015-08-03 10:30:10 +02:00
Arnaud Aujon
ed657d2bdf hopefully fix travis errors 2015-06-01 20:39:51 +02:00
Arnaud Aujon
9bd32d7bf6 Merge remote-tracking branch 'upstream/develop' into 3.7-webservices-fix 2015-06-01 20:10:51 +02:00
Arnaud Aujon
3099e2acc4 fix travis issues again 2015-06-01 14:15:09 +02:00
Arnaud Aujon
0c66c9745e fix travis error 2015-06-01 13:04:33 +02:00
Laurent Destailleur
65c7ab7a93 Fix: Introduce error by default when function is used as a true delete 
function.
 2015-05-29 17:11:42 +02:00
Arnaud Aujon
3003b41a88 add test for invoices API 2015-05-28 16:57:28 +02:00
Arnaud Aujon
05a7ab158b add deleteThirdParty api call + add tests 2015-05-28 16:56:45 +02:00
Arnaud Aujon
336b8c49b3 update test 2015-05-27 15:42:46 +02:00
Arnaud Aujon
6d5555948e Merge remote-tracking branch 'upstream/develop' into 3.7-webservices-fix 
Conflicts:
	test/phpunit/WebservicesInvoicesTest.php
 2015-05-21 13:11:41 +02:00
Arnaud Aujon
2db885a2b3 first attempt to add test 2015-05-11 13:51:57 +02:00
jfefe
0d14cb8709 Modify thirdparty delete() method to pass user object as an argument. 2015-05-03 18:44:42 +02:00
Laurent Destailleur
a0c27620b2 Fix to match spanish new vat value 2015-04-26 18:28:08 +02:00
Laurent Destailleur
1abcd5f4fe Fix test for vat calculation 2015-04-26 16:58:00 +02:00
Laurent Destailleur
4235d74aac Fix tests for ES 2015-04-26 16:45:24 +02:00
Juanjo Menent
3d08280026 Fix test for es. testGetDefaultLocalTax 2015-04-23 10:35:08 +02:00
Juanjo Menent
e2635f66f5 Fix test for es 2015-04-22 22:10:50 +02:00
Laurent Destailleur
6b15cafb4e Add protection to request some module to be on for AllTests 2015-04-22 21:38:34 +02:00
Laurent Destailleur
208ac31bf8 Fix test for es 2015-04-22 17:39:09 +02:00
Juanjo Menent
ad31f0110a Improve PHPUnit Prices test for Spanish localtax1 and localtax2 2015-04-21 22:01:53 +02:00
Laurent Destailleur
f06255e9d2 Complete the mailmap file. 2015-04-21 16:57:45 +02:00
Laurent Destailleur
22921ad26b Fix phpunit 2015-04-19 04:43:28 +02:00
Laurent Destailleur
72845b21c7 Add log 2015-04-19 04:01:31 +02:00
Laurent Destailleur
6db76830fd Fix load module by test 2015-04-19 03:36:27 +02:00
Laurent Destailleur
e508b28d74 Fix doliforge bug 1707 2015-04-15 18:53:39 +02:00
Laurent Destailleur
bf254baa02 Fix doliforge bug 1707 2015-04-15 18:50:41 +02:00
Laurent Destailleur
ae103e34b8 Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	build/debian/changelog
	htdocs/compta/facture.php
	htdocs/core/lib/price.lib.php
	htdocs/install/mysql/migration/3.6.0-3.7.0.sql
	htdocs/opensurvey/public/studs.php
	htdocs/projet/element.php
 2015-04-13 13:08:46 +02:00
Laurent Destailleur
6889162d7a Fix: management of vat type 2, 4 and 6 is now ok. 
Works for canada and ivory cost.
 2015-04-11 22:51:53 +02:00
Laurent Destailleur
747c780f67 Enhance phpunit tests 2015-04-04 02:44:42 +02:00
Laurent Destailleur
9f5ba746a1 Update phpunit tests 2015-04-04 00:51:00 +02:00
Laurent Destailleur
8e9c1c4747 Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	htdocs/commande/card.php
	htdocs/commande/class/commande.class.php
	htdocs/commande/list.php
	htdocs/core/class/notify.class.php
	htdocs/core/login/functions_dolibarr.php
	htdocs/exports/export.php
	htdocs/langs/en_US/admin.lang
 2015-04-01 16:33:39 +02:00
Laurent Destailleur
42c2c81e28 Fix detection of html was wrong with img 2015-03-26 12:05:52 +01:00
Laurent Destailleur
a55af4387b Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	.travis.yml
	htdocs/core/class/notify.class.php
	htdocs/product/stock/class/mouvementstock.class.php
	test/phpunit/AllTests.php
	test/phpunit/MouvementStockTest.php
 2015-03-22 12:10:39 +01:00
Laurent Destailleur
c9b569ad1a Fix calculation of PMP of product. 
Also add phpunit test to avoid this in future.
 2015-03-21 15:31:11 +01:00
Laurent Destailleur
4f9aef6150 Fix calculation of PMP of product. 
Also add phpunit test to avoid this in future.
 2015-03-21 15:29:23 +01:00
Laurent Destailleur
435be30047 Clean code 2015-03-17 00:35:17 +01:00
Laurent Destailleur
5335a6affa NEW: Add close date and user for projects. 2015-03-04 16:28:29 +01:00
Marcos García de La Fuente
8dffe2a910 Corrected FunctionsLibTest:testGetBrowserInfo 2015-02-28 19:33:19 +01:00
Marcos García de La Fuente
60e2524fc2 Merge remote-tracking branch 'upstream/develop' into better-practice 
Conflicts:
	htdocs/core/lib/functions.lib.php
	test/phpunit/FunctionsLibTest.php
 2015-02-28 14:39:14 +01:00
Marcos García de La Fuente
ceec3e926e Typo 2015-02-25 16:47:34 +01:00
Marcos García de La Fuente
f598963d6b Fixed regression 2015-02-25 16:41:51 +01:00
Laurent Destailleur
6d3834b3b9 Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	htdocs/compta/prelevement/class/bonprelevement.class.php
	htdocs/index.php
	htdocs/projet/class/project.class.php
	test/phpunit/BankAccountTest.php
 2015-02-23 14:59:24 +01:00
Marcos García de La Fuente
abda67adc2 Improved testGetBrowserInfo 2015-02-23 10:45:22 +01:00
Marcos García de La Fuente
71b98ee82b Safari can appear in iPad, iPod, iPhone and future Apple products, it is not fair to attach it to one of them. 2015-02-23 10:42:10 +01:00
Marcos García de La Fuente
102d2d9d36 Added IE11 test to testGetBrowserInfo 2015-02-23 10:39:02 +01:00
Marcos García de La Fuente
ce916f3bcb Better practice in getBrowserInfo 2015-02-22 12:35:51 +01:00
Laurent Destailleur
938936b8f2 Merge remote-tracking branch 'origin/3.6' into 3.7 
Conflicts:
	htdocs/core/lib/agenda.lib.php
	htdocs/core/lib/functions.lib.php
 2015-02-20 22:51:47 +01:00
Laurent Destailleur
bd6b465ee1 Add phpunit for ie11 and ie10 2015-02-20 20:16:15 +01:00
Laurent Destailleur
9e078b32d2 Fixes the way the RUM number is generated. Start phpunit test. 2015-02-20 18:35:52 +01:00
Laurent Destailleur
2a9ba93712 Update test of module inits 2015-02-14 12:32:22 +01:00
Laurent Destailleur
01541e4152 Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	htdocs/comm/action/card.php
	htdocs/core/datepicker.php
 2015-02-03 12:17:45 +01:00
Laurent Destailleur
20121c2fbe Fix pb into date management. 
Added phpunit to avoid this in future.
 2015-02-03 11:25:51 +01:00
Laurent Destailleur
4fdc287717 Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	htdocs/accountancy/customer/card.php
	htdocs/accountancy/journal/sellsjournal.php
	htdocs/admin/menus.php
	htdocs/fourn/commande/card.php
	htdocs/install/check.php
 2015-01-30 15:53:06 +01:00
Laurent Destailleur
3ebaaa38d2 Fixed: Management of option SERVICE_ARE_ECOMMERCE_200238EC 2015-01-25 16:04:37 +01:00
Laurent Destailleur
fdaa930507 Solve phpunit. 
Fix database field format
 2015-01-19 01:58:48 +01:00
Laurent Destailleur
f96fdc7d0a Regression solved 2015-01-18 21:04:39 +01:00
Laurent Destailleur
c54355b63a Merge remote-tracking branch 'origin/3.7' into develop 2015-01-16 10:44:41 +01:00
Laurent Destailleur
d16ce7eb96 Fix: Bad var 2015-01-15 02:42:41 +01:00
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
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
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
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
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