Mirrors/dolibarr
1
0
Fork 0
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-02-20 13:46:52 +01:00
Code Issues Packages Projects Releases Wiki Activity
72,072 Commits 35 Branches 179 Tags 1.7 GiB
afee39ea68
Commit Graph

2030 Commits

Author SHA1 Message Date
Laurent Destailleur
85cd23caaf Fix phpcs 2018-12-15 18:31:36 +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
Laurent Destailleur
6952f346ad Prepare 8.0.1 2018-09-02 17:47:21 +02:00
Laurent Destailleur
c791f37da9 Doc 2018-09-01 12:09:40 +02:00
Laurent Destailleur
4379d6b49d Prepare 9.0 2018-08-21 14:15:01 +02:00
Laurent Destailleur
d8365e9260 Module DAV 2018-08-19 02:17:12 +02:00
Philippe GRAND
4858f6a07e Fix : typo 2018-07-09 14:34:54 +02:00
Laurent Destailleur
653134e179 Fix changelog 2018-07-06 12:06:16 +02:00
Laurent Destailleur
bb79257827 Prepare Changelog 2018-07-06 12:00:12 +02:00
Regis Houssin
496907d448 Fix: changelog 2018-07-01 10:15:47 +02:00
Laurent Destailleur
5c93fa1bfb Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/accountancy/admin/journals_list.php
	htdocs/compta/facture/fiche-rec.php
	htdocs/core/class/html.form.class.php
	htdocs/filefunc.inc.php
	htdocs/langs/fr_FR/other.lang
 2018-06-26 01:25:03 +02:00
Laurent Destailleur
edec89ef1e Prepare 7.0.3 2018-06-23 12:44:30 +02:00
Laurent Destailleur
ad2df304b4 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/accountancy/customer/lines.php
	htdocs/fourn/commande/card.php
	htdocs/societe/class/societe.class.php
 2018-06-18 13:31:29 +02:00
Laurent Destailleur
5fe8249706 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	ChangeLog
 2018-05-05 23:22:04 +02:00
Laurent Destailleur
4f0e053463 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 
Conflicts:
	ChangeLog
 2018-05-05 21:58:17 +02:00
Laurent Destailleur
d4d4f8cc83 Prepare 7.0.2 2018-05-05 20:29:06 +02:00
Laurent Destailleur
b958311819 Prepare 6.0.7 2018-05-05 20:25:06 +02:00
Laurent Destailleur
bdf4c0704b Removed depreaceted not used method Categorie::get_nb_categories() 2018-05-05 13:40:45 +02:00
Laurent Destailleur
486a372d44 Remove old deprecated hook insertExtraFields. Triggers must be used for 
action on CRUD events.
 2018-04-10 12:03:42 +02:00
Laurent Destailleur
b6e9e0e287 Fix missing hooks 2018-03-30 16:44:58 +02:00
Laurent Destailleur
72cedcf9f3 Removed method fetch_prods() and get_each_prod() not used, keep only 
get_arbo_each_prod() that is better.
 2018-03-22 18:01:06 +01:00
Laurent Destailleur
aa859f980d Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-03-22 14:21:17 +01:00
Laurent Destailleur
a9944e1d23 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 
Conflicts:
	ChangeLog
	htdocs/contrat/card.php
 2018-03-22 14:19:34 +01:00
Laurent Destailleur
5efb94b06f Prepare 5.0.6 2018-03-22 14:13:58 +01:00
Laurent Destailleur
9980a5fbd0 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	ChangeLog
 2018-03-22 14:08:43 +01:00