lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
71,459 Commits 43 Branches 150 Tags 886 MiB
b67101c77c
Commit Graph

71459 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Chl
b67101c77c corr. #10154 2018-12-03 18:09:25 +01:00
Chl
864ce85341 NEW adding hooks to createRecurringInvoices() 
For example : send the newly generated invoice by mail.

We send the counter and the total so launching some action
on the last loop (generated invoice or error) is possible.

(bonus: correcting error reporting $this->errors to $this->errors[] )
 2018-12-02 01:34:13 +01:00
Chl
95b5d8790d corr. typo 2018-12-02 01:34:13 +01:00
Chl
6ea0919ebb facture-rec.class.php: reindent 2018-12-02 01:34:13 +01:00
Laurent Destailleur
070b1d04c9
Merge pull request #10151 from frederic34/patch-17 
fix doc comment fournisseur.facture.class.php
 2018-12-01 23:06:02 +01:00
Laurent Destailleur
6f3d2e98a2
Merge pull request #10150 from frederic34/patch-9 
add log in empty catch
 2018-12-01 23:04:41 +01:00
Laurent Destailleur
c9ed381079
Merge pull request #10149 from frederic34/patch-2 
fix doc comment pdf_strato.modules.php
 2018-12-01 23:02:27 +01:00
Frédéric FRANCE
9692e98acf
Update fournisseur.facture.class.php 2018-12-01 22:49:12 +01:00
Frédéric FRANCE
471ea35d6c
add log in empty catch 2018-12-01 22:26:45 +01:00
Frédéric FRANCE
c6291b3e08
Update pdf_strato.modules.php 2018-12-01 21:59:37 +01:00
Frédéric FRANCE
912f7c6c68
Update pdf_strato.modules.php 2018-12-01 21:41:40 +01:00
Laurent Destailleur
96741290ba
Merge pull request #10147 from andreubisquerra/master 
Fix issues on TakePOS
 2018-12-01 20:25:45 +01:00
andreubisquerra
8f1a00bbf1 Fix issues on TakePOS 2018-12-01 19:55:35 +01:00
Laurent Destailleur
c3e2f73e48 FIX #10144 2018-12-01 19:45:30 +01:00
Laurent Destailleur
6d84036f66 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/comm/action/index.php
	htdocs/contact/list.php
	htdocs/core/class/html.form.class.php
	htdocs/expensereport/card.php
	htdocs/install/doctemplates/shipment/template_shipment.odt
	htdocs/public/payment/newpayment.php
 2018-12-01 19:23:06 +01:00
Laurent Destailleur
cb9ada2119 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 
Conflicts:
	htdocs/core/class/html.form.class.php
	htdocs/core/class/html.formmail.class.php
	htdocs/core/modules/modSociete.class.php
	htdocs/product/price.php
 2018-12-01 18:19:45 +01:00
Laurent Destailleur
a49a083629
Merge pull request #10142 from atm-maxime/fix_import_fk_dept 
Fix add missing fk_department and fk_pays in contact/bank imports
 2018-12-01 17:14:27 +01:00
Laurent Destailleur
0fb95c91a4
Merge pull request #10141 from andreubisquerra/master 
TakeBOX now is 'TakePOS Connector'
 2018-12-01 17:14:01 +01:00
Laurent Destailleur
2ae7aa46b6
Merge pull request #10140 from frederic34/patch-20 
fix travis
 2018-12-01 17:13:21 +01:00
Laurent Destailleur
e30bee50a2
Merge pull request #10139 from atm-john/fix_#8741 
FIX #8741
 2018-12-01 17:12:55 +01:00
Maxime Kohlhaas
13806124b2 Fix add missing fk_department and fk_pays in contact/bank imports 2018-12-01 17:11:04 +01:00
Frédéric FRANCE
9ceea06468
fix travis 2018-12-01 17:10:06 +01:00
andreubisquerra
1009588592 TakeBOX now is 'TakePOS Connector' 2018-12-01 17:09:21 +01:00
ATM John BOTELLA
474228cbd6 FIX #8741 2018-12-01 17:01:11 +01:00
Laurent Destailleur
b41e0a40e7
Merge pull request #10138 from inoveaconseil/patch-4 
FIX #6580
 2018-12-01 16:56:31 +01:00
Inovea Conseil
18281d9d43
FIX #6580 
FIX #6580
 2018-12-01 16:48:50 +01:00
Laurent Destailleur
e4bc9f8f87
Merge pull request #10136 from grandoc/8.0 
fix :#9967
 2018-12-01 16:45:37 +01:00
Maxime Kohlhaas
748dd12e4d
Merge pull request #9056 from ATM-Nicolas/fix_default_preselected_mail_model 
FIX : Select first mail model by default
 2018-12-01 16:39:22 +01:00
Laurent Destailleur
3d09b05338
Merge pull request #10135 from atm-florian/8.0_fix9999 
fix #9999
 2018-12-01 16:31:02 +01:00
Philippe GRAND
bbf3b3baac fix :#9967 2018-12-01 16:27:14 +01:00
florian HENRY
c320dcd161 Merge branch '8.0' of https://github.com/Dolibarr/dolibarr.git into 8.0_fix9999 2018-12-01 16:24:20 +01:00
florian HENRY
589511f38c fix #9999 2018-12-01 16:23:40 +01:00
Laurent Destailleur
3ea69cb1f1
Merge pull request #10130 from inoveaconseil/patch-3 
Fix #9572
 2018-12-01 16:22:38 +01:00
Laurent Destailleur
508cb459eb
Merge pull request #10134 from frederic34/patch-18 
devcamp 2018 fix #9642
 2018-12-01 16:21:30 +01:00
Frédéric FRANCE
61322b9ce2
devcamp 2018 fix #9642 2018-12-01 16:19:54 +01:00
Laurent Destailleur
2069223e4e
Merge pull request #10133 from defrance/patch-133 
fix #9475
 2018-12-01 16:19:10 +01:00
BENKE Charlene
1dc2fc5060
fix #9475 2018-12-01 16:17:52 +01:00
Laurent Destailleur
a8009d4a72
Merge pull request #9972 from OPEN-DSI/contact-agenda-multiple-resources 
FIX Work with new table actioncomm_resources and multiple contact affectation
 2018-12-01 16:16:50 +01:00
Laurent Destailleur
9ac984af76
Update company.lib.php 2018-12-01 16:15:34 +01:00
Inovea Conseil
0ba5fda3da
Update price.php 2018-12-01 16:11:49 +01:00
Laurent Destailleur
3b4ee295f3
Merge pull request #10129 from simnandez/8.0 
Fix #9929
 2018-12-01 15:58:38 +01:00
Inovea Conseil
8964ec7ea1
Fix #9572 
Fix #9572
 2018-12-01 15:58:37 +01:00
Laurent Destailleur
07713ca08e
Merge pull request #10103 from laudeco/feature/fix_docker_creation 
fix docker image creation + adding the support of xdebug
 2018-12-01 15:54:56 +01:00
Juanjo Menent
7d4553179d Fix #9929 2018-12-01 15:48:46 +01:00
Laurent Destailleur
6076976e3b
Merge pull request #10128 from grandoc/new_branch_01_12_2018 
fix scrutinizer issue : The variable  seems only to be defined at a l…
 2018-12-01 15:48:38 +01:00
Philippe GRAND
3df83d7cf3 fix scrutinizer issue : The variable seems only to be defined at a later point 2018-12-01 15:45:02 +01:00
Laurent Destailleur
5c755b6f9f
Merge pull request #10095 from ptibogxiv/patch-97 
Fix duration display product/service  in list.php
 2018-12-01 15:14:57 +01:00
Laurent Destailleur
778547818d
Merge pull request #10108 from frederic34/patch-2 
Avoid adding libs not compatible with php 5.4
 2018-12-01 15:09:25 +01:00
Laurent Destailleur
5d3575ab4d
Merge pull request #10126 from atm-florian/develop 
fix scrutinizer
 2018-12-01 15:08:45 +01:00
Laurent Destailleur
03f0922325
Merge pull request #10087 from AurelGDN/develop 
New Takepos: cheque payment button in cashdesk
 2018-12-01 15:03:19 +01:00