Commit Graph

72322 Commits

Author SHA1 Message Date
IJ
34326f9102
Undo Add Access Keys in Help Link ... from previous commit
Not relevant anymore as the new code will detect browser and show the relevant string
2018-12-02 10:22:47 +00:00
IJ
be523a737e
Undo Access Key Strings from previous commit 2018-12-02 10:19:37 +00:00
Alexandre SPANGARO
088c002ed1 NEW: Add stats on entries & movements by fiscal year 2018-12-02 11:01:11 +01:00
Alexandre SPANGARO
2466fa224c Merge remote-tracking branch 'upstream/develop' into 10.0_accoutancy_stats 2018-12-02 10:48:55 +01:00
BENKE Charlene
044c54da94
Warning error if $conf->browser->layout is empty 2018-12-02 10:45:37 +01:00
Frédéric FRANCE
3b31354dc2
cats may be int or array 2018-12-02 10:33:23 +01:00
BENKE Charlene
172c1ac49f
Update list.php 2018-12-02 10:14:40 +01:00
Frédéric FRANCE
ab02cb3cde
doc comment adherent class 2018-12-02 10:12:40 +01:00
Philippe GRAND
8ec2bac36a FIX #3234 2018-12-02 10:02:05 +01:00
BENKE Charlene
65dc066352
Update list.php 2018-12-02 10:01:38 +01:00
BENKE Charlene
ad1ca07085
Update list.php 2018-12-02 09:58:18 +01:00
BENKE Charlene
1bc0defb31
Update list.php 2018-12-02 09:55:26 +01:00
Frédéric FRANCE
d2d623b0b6
GETPOSTISSET has only one param 2018-12-02 09:26:24 +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
Maxime Kohlhaas
ad05b531e7 Fix display user photo with new path 2018-12-02 00:02:43 +01:00
BENKE Charlene
7378a2f1c6
Update list.php 2018-12-02 00:02:10 +01:00
Maxime Kohlhaas
328787546f Merge branch 'fix_user_photo' of github.com:atm-maxime/dolibarr into fix_user_photo 2018-12-01 23:57:20 +01:00
Maxime Kohlhaas
72225f6524 Migration of user photo paths 2018-12-01 23:57:15 +01:00
BENKE Charlene
6ac3cfdd99
Update list.php 2018-12-01 23:48:36 +01:00
BENKE Charlene
b104c0889d
Update list.php 2018-12-01 23:44:24 +01:00
BENKE Charlene
f07d1411aa
Update list.php 2018-12-01 23:41:15 +01:00
Maxime Kohlhaas
09b967bb1b Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into fix_user_photo 2018-12-01 23:39:28 +01:00
BENKE Charlene
0d35f04cb7
Update list.php 2018-12-01 23:36:26 +01:00
BENKE Charlene
21b55f3a83
refactoring dol_sql_datefilter 2018-12-01 23:30:58 +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
Laurent Destailleur
0668f90e14
Merge pull request #10146 from atm-maxime/fix_ecm_expensereport
Fix expense report in ecm auto dir
2018-12-01 23:02:09 +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
atm-ph
edb2283e3a Fix missing return 2018-12-01 20:41:19 +01:00
atm-ph
658e295a94 New bash to convert snake case function into camel case 2018-12-01 20:26:17 +01:00
Laurent Destailleur
96741290ba
Merge pull request #10147 from andreubisquerra/master
Fix issues on TakePOS
2018-12-01 20:25:45 +01:00
Maxime Kohlhaas
58e0a29d21 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into fix_user_photo 2018-12-01 20:08:32 +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
Maxime Kohlhaas
5e2f3a53c9 Fix expense report in ecm auto dir 2018-12-01 19:39:00 +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