lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
73,362 Commits 43 Branches 150 Tags 886 MiB
4569cb82b2
Commit Graph

2053 Commits

Author SHA1 Message Date
Laurent Destailleur
abbc9062ef Merge 2019-06-27 13:54:31 +02:00
Laurent Destailleur
fa986e311d Merge 2019-06-27 13:45:21 +02:00
Laurent Destailleur
12d3a7021f Prepare 8.0.5 2019-06-26 18:50:31 +02:00
Laurent Destailleur
ad725b3bb0 Doc 2019-06-25 22:27:35 +02:00
Laurent Destailleur
1277e36179 Prepare 9.0.4 2019-06-25 13:30:18 +02:00
Laurent Destailleur
9242c1a630 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 
Conflicts:
	ChangeLog
	htdocs/contrat/services_list.php
	htdocs/core/lib/files.lib.php
	htdocs/filefunc.inc.php
	htdocs/product/list.php
 2019-05-13 12:22:14 +02:00
Juanjo Menent
7041c3246e Prepare 8.0.5 2019-05-11 22:35:56 +02:00
Laurent Destailleur
d53117da3f Update log 2019-05-09 15:34:42 +02:00
Laurent Destailleur
677b333d0a FIX: Add hidden option MAIN_PDF_HIDE_SITUATION to hide situation (quick 
hack to fix output pb).
 2019-05-09 12:38:00 +02:00
Laurent Destailleur
08fcfded76 Prepare 9.0.3 2019-05-08 22:00:13 +02:00
Laurent Destailleur
81ccf4d1f0 Update doc 2019-04-07 18:43:30 +02:00
Laurent Destailleur
66142cef76 Prepare 9.0.2 2019-04-07 18:40:37 +02:00
Laurent Destailleur
28a4217660 Prepare 9.0.1 2019-03-05 15:52:03 +01:00
Laurent Destailleur
9b2a91893d Update doc 2019-02-08 10:49:02 +01:00
Laurent Destailleur
662ed9fba7 Prepare 9.0.1 2019-02-08 10:47:25 +01:00
Laurent Destailleur
7ea5407ac1 Update doc 2019-01-10 01:57:47 +01:00
Laurent Destailleur
d2f6899346 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 
Conflicts:
	htdocs/accountancy/journal/bankjournal.php
	htdocs/admin/defaultvalues.php
	htdocs/societe/card.php
 2019-01-08 01:53:00 +01:00
Laurent Destailleur
9d8b084115 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 
Conflicts:
	ChangeLog
	htdocs/core/actions_sendmails.inc.php
	htdocs/filefunc.inc.php
 2019-01-08 01:48:54 +01:00
Juanjo Menent
96967100ba Prepare 7.0.5 2019-01-05 13:35:32 +01:00
ldestailleur
cf84fdf7c7 Translate option "Simplify interface for blind persons" 2019-01-03 20:07:58 +01:00
ldestailleur
a9e8e13bb6 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 
Conflicts:
	ChangeLog
	htdocs/user/param_ihm.php
 2019-01-02 19:41:39 +01:00
Laurent Destailleur
730f5d1ad4 Prepare 8.0.4 2018-12-23 14:05:37 +01:00
Laurent Destailleur
541c978a68 Update doc 2018-12-09 00:39:21 +01:00
Laurent Destailleur
9c68e29773 Typo 2018-12-09 00:24:30 +01:00
Laurent Destailleur
034c846ce2 Typo 2018-11-30 12:38:16 +01:00
Laurent Destailleur
dd357d167a Update ChangeLog 2018-11-30 11:00:42 +01:00
Laurent Destailleur
8c61529aee Update doc 2018-11-20 20:31:02 +01:00
Laurent Destailleur
ae8120041e Typo 2018-11-06 10:07:46 +01:00
Laurent Destailleur
7f4276cd6f Update doc 2018-11-06 10:07:28 +01:00
Laurent Destailleur
67fbb3dbb6 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	ChangeLog
	htdocs/core/class/notify.class.php
	htdocs/core/modules/project/doc/doc_generic_project_odt.modules.php
 2018-11-03 19:15:52 +01:00
Laurent Destailleur
19134e82cb Prepare 8.0.3 2018-10-31 12:23:53 +01:00
Laurent Destailleur
2c1e8d6535 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/accountancy/bookkeeping/balance.php
	htdocs/expedition/class/expeditionbatch.class.php
	htdocs/public/payment/newpayment.php
	htdocs/stripe/config.php
 2018-10-16 18:47:11 +02:00
Laurent Destailleur
532e05c42e Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 
Conflicts:
	ChangeLog
	htdocs/filefunc.inc.php
 2018-10-13 14:29:51 +02:00
Laurent Destailleur
bd60fe6ffd Prepare 7.0.4 2018-10-12 19:13:11 +02:00
Laurent Destailleur
bb606df5e0 Prepare 7.0.4 2018-10-12 19:12:20 +02:00
Laurent Destailleur
9f27dd41e5 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 
Conflicts:
	ChangeLog
	htdocs/filefunc.inc.php
	htdocs/societe/class/societe.class.php
 2018-10-12 19:08:06 +02:00
Laurent Destailleur
817920f282 Prepare 6.0.8 2018-10-12 17:36:49 +02:00
Laurent Destailleur
ced4038443 FIX qty not visible for a lot when making shipment on a dedicated stock 2018-10-11 11:56:52 +02:00
Laurent Destailleur
f990719daa Add experimental module TakePOS 2018-09-28 13:31:41 +02:00
Laurent Destailleur
a1c20ceb87 PHP 7.3 ready 2018-09-28 10:39:03 +02:00
Laurent Destailleur
5bd538fb2c Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	ChangeLog
	htdocs/core/modules/modStripe.class.php
	htdocs/filefunc.inc.php
	htdocs/projet/element.php
 2018-09-20 23:43:34 +02:00
Laurent Destailleur
d35687c8b3 Work on module social network 2018-09-19 01:45:56 +02:00
Laurent Destailleur
58e82008ac Prepare 8.0.2 2018-09-18 16:45:08 +02:00
Laurent Destailleur
1d209722a8
Merge pull request #9445 from frederic34/patch-13 
typo
 2018-09-12 18:25:39 +02:00
Laurent Destailleur
f5074f4962 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-09-12 18:12:17 +02:00
Laurent Destailleur
902bdf540e Update ChangeLog 2018-09-12 13:45:04 +02:00
Frédéric FRANCE
a9896fb967
typo 2018-09-09 14:21:44 +02:00
Laurent Destailleur
d86ebad006 Update doc 2018-09-09 13:28:24 +02:00
Laurent Destailleur
540999faa5 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	ChangeLog
	htdocs/core/lib/company.lib.php
 2018-09-03 14:06:51 +02:00
Laurent Destailleur
6876785347 Doc 2018-09-03 11:37:45 +02:00