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

39492 Commits

Author SHA1 Message Date
guillaume
207fa671b1 Mise en place de l'initialisation de la base avec PDO SQlite 2015-02-25 09:04:11 +01:00
Laurent Destailleur
1bba3a01e2 phpcs 2015-02-22 23:41:34 +01:00
Laurent Destailleur
6e10dd3cce Trad 2015-02-22 17:10:13 +01:00
Laurent Destailleur
4781707fa4 Fix jodconverter can't work without the wrapper jodconverter. 2015-02-22 16:01:01 +01:00
Laurent Destailleur
2bc6ac4671 Finished new module to manage expense reports ! 
Fix export to support corectly multicompany
 2015-02-22 13:16:49 +01:00
Laurent Destailleur
6d1324b463 Work on expense report module 2015-02-21 16:15:54 +01:00
Laurent Destailleur
30a5111c68 Work on expense report module 2015-02-21 15:18:05 +01:00
Laurent Destailleur
5dffe4b440 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-02-21 12:58:14 +01:00
Laurent Destailleur
070accd1e0 Work on new module expense report 2015-02-21 12:57:17 +01:00
Laurent Destailleur
d2da098336 Fixed example 2015-02-21 10:00:31 +01:00
Laurent Destailleur
2b045ba74a Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-02-21 09:52:59 +01:00
Laurent Destailleur
2b4f7a41bf Merge pull request #2377 from aspangaro/develop-patch5 
NEW: Update PHPExcel library to 1.8.0
 2015-02-21 00:22:21 +01:00
Laurent Destailleur
6e66197621 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-02-20 23:49:06 +01:00
Laurent Destailleur
03751d61f2 Merge pull request #2376 from aspangaro/develop-patch4 
Update FPDI library to 1.5.2
 2015-02-20 23:46:33 +01:00
Laurent Destailleur
7681e238be Merge pull request #2372 from frederic34/patch-2 
Update account.class.php
 2015-02-20 23:35:15 +01:00
Laurent Destailleur
e13393da9a Merge pull request #2364 from daamien/patch-2 
FIX [ bug #1314 ] [Bank] num_releve is not incremented correctly in releve.php
 2015-02-20 18:58:10 +01:00
Sof
ba80bbb291 FIX; Unknown field 'sc.fk_soc' in field list 2015-02-20 17:33:58 +01:00
Laurent Destailleur
49cb36461c Typo 2015-02-20 15:54:16 +01:00
Laurent Destailleur
dec277f30f Accept h tags 2015-02-20 15:53:19 +01:00
aspangaro
50990bc862 Update PHPExcel library to 1.8.0 2015-02-20 05:50:36 +01:00
aspangaro
0205848a0e Update FPDI library to 1.5.2 
Contain FPDF_TPL natively
 2015-02-20 05:21:18 +01:00
aspangaro
014f255f22 Update FPDF_TPL library to 1.2.3 2015-02-20 05:09:07 +01:00
Laurent Destailleur
94751ba57b Merge pull request #2361 from aspangaro/3.7-patch3 
[T1728] Deactivate RIB suggest in proposals/invoices/orders
 2015-02-19 09:41:39 +01:00
Laurent Destailleur
e7a82c89e6 Merge pull request #2351 from mrsof/develop 
FIX : Let ability to use IDPROF verifications even if new entry is "priv...
 2015-02-19 09:36:45 +01:00
Frédéric FRANCE
b73f1eb827 Update account.class.php 2015-02-19 08:40:38 +01:00
Laurent Destailleur
a6e2e5ffcb Merge pull request #2360 from delcroip/patch-1 
export on user
 2015-02-19 00:14:04 +01:00
Laurent Destailleur
e3713c8b6d Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	htdocs/admin/tools/eaccelerator.php
	htdocs/fourn/class/fournisseur.commande.class.php
	htdocs/fourn/commande/dispatch.php
 2015-02-19 00:01:26 +01:00
Laurent Destailleur
774389940e Merge remote-tracking branch 'origin/3.6' into 3.7 
Conflicts:
	ChangeLog
	htdocs/comm/propal/list.php
	htdocs/compta/bank/ligne.php
	htdocs/compta/resultat/clientfourn.php
	htdocs/compta/salaries/fiche.php
	htdocs/core/lib/functions.lib.php
	htdocs/fourn/facture/paiement.php
 2015-02-18 23:51:41 +01:00
Laurent Destailleur
e7d95f553b Merge remote-tracking branch 'origin/3.5' into 3.6 2015-02-18 23:43:22 +01:00
Laurent Destailleur
25ba9d2c97 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-02-18 23:43:00 +01:00
Laurent Destailleur
bd9c168e3c Doxygen 2015-02-18 23:42:39 +01:00
Laurent Destailleur
316e5c2f19 Merge pull request #2358 from marcosgdf/board-refactor 
Refactored dashboard indicator
 2015-02-18 23:39:15 +01:00
Laurent Destailleur
2f5c94fb4a Merge pull request #2357 from KreizIT/fix_mssql 
Fix mssql
 2015-02-18 23:32:48 +01:00
Laurent Destailleur
a05e39f119 Merge pull request #2356 from KreizIT/fix_sqldata 
Fix inconsistent data
 2015-02-18 23:31:22 +01:00
Laurent Destailleur
271bcb5313 Merge pull request #2354 from aspangaro/3.7-patch2 
FIXED All constants COMPTA_* was renamed in ACCOUNTING_*
 2015-02-18 23:27:47 +01:00
Laurent Destailleur
9afe52458b Merge branch 'patch-47' of https://github.com/defrance69/dolibarr into defrance69-patch-47 2015-02-18 23:23:44 +01:00
Laurent Destailleur
d7dcf28c61 Merge branch '3.7' of https://github.com/atm-gauthier/dolibarr into 
atm-gauthier-3.7

Conflicts:
	htdocs/install/mysql/migration/3.6.0-3.7.0.sql
 2015-02-18 23:15:40 +01:00
Laurent Destailleur
2d2930b421 Merge pull request #2348 from tiaris/3.7_actionclassbug 
fetch must contain an left join on c_actioncom for correct function
 2015-02-18 23:02:44 +01:00
Laurent Destailleur
ceb3920381 Merge pull request #2346 from aaujon/3.6-webservice-order 
fix typo in createOrder
 2015-02-18 23:00:06 +01:00
Laurent Destailleur
22fdcfc272 Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.7 2015-02-18 22:54:44 +01:00
Laurent Destailleur
4963555669 Merge branch 'misc' of https://github.com/marcosgdf/dolibarr into 
marcosgdf-misc

Conflicts:
	htdocs/barcode/codeinit.php
 2015-02-18 22:54:02 +01:00
Laurent Destailleur
ad1c2ed06f Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-02-18 22:52:50 +01:00
Laurent Destailleur
ead6b4bf95 Merge branch 'bug-1830' of https://github.com/marcosgdf/dolibarr into 
marcosgdf-bug-1830

Conflicts:
	ChangeLog
 2015-02-18 22:50:12 +01:00
Laurent Destailleur
fc415fc3c9 Fix: [ bug #1826 ] Supplier payment types are not translated in 
fourn/facture/paiement.php
 2015-02-18 22:44:42 +01:00
Laurent Destailleur
6d25cf6f6a Merge branch 'bug-1832' of https://github.com/marcosgdf/dolibarr into 
marcosgdf-bug-1832

Conflicts:
	ChangeLog
 2015-02-18 22:41:32 +01:00
Laurent Destailleur
c2f5b24a9d Better text 2015-02-18 22:40:13 +01:00
Laurent Destailleur
06c90e67bb Merge pull request #2339 from KreizIT/fix_1829 
FIXED: #1829 POS not compatible with batch products
 2015-02-18 22:38:19 +01:00
Laurent Destailleur
8f339712ab Merge pull request #2338 from aaujon/3.6-webservice-product-barcode 
FIXED : product webservice can now save barcode
 2015-02-18 22:24:20 +01:00
Laurent Destailleur
863094637e Merge pull request #2333 from FHenry/develop_review_productstat 
review product stats list and add filter by period
 2015-02-18 22:23:33 +01:00
Laurent Destailleur
89b9364837 Merge pull request #2337 from marcosgdf/bug-1822 
Fix: [ bug #1822 ] SQL error in clientfourn.php report with PostgreSQL
 2015-02-18 22:23:07 +01:00