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

73615 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Laurent Destailleur
4a873917ce Fix import 2018-12-04 12:40:36 +01:00
Regis Houssin
aa3e520725 FIX wrong path, multidir_output[] for each entity is construct by the 
multicompany module
 2018-12-04 09:12:36 +01:00
Maxime Kohlhaas
79b6719b88 Change index 2018-12-04 09:00:53 +01:00
Alexandre SPANGARO
3b8dd71816 Remove public $db 2018-12-03 21:25:44 +01:00
Alexandre SPANGARO
0c6f6b80cb Merge remote-tracking branch 'upstream/develop' into 10.0_accoutancy_stats 2018-12-03 21:16:53 +01:00
Chl
b67101c77c corr. #10154 2018-12-03 18:09:25 +01:00
Regis Houssin
dcbb7c49fc FIX wrong value for instal lock 2018-12-03 13:31:28 +01:00
Regis Houssin
a2f514d4a1 FIX possibility to force install lock with GET/POST or script 2018-12-03 13:12:42 +01:00
Ferran Marcet
602986ced8 Merge remote-tracking branch 'origin/7.0' into 7.0 
# Conflicts:
#	htdocs/comm/propal/class/propal.class.php
#	htdocs/commande/class/commande.class.php
#	htdocs/expensereport/class/expensereport.class.php
#	htdocs/fourn/class/fournisseur.commande.class.php
 2018-12-03 12:33:18 +01:00
Ferran Marcet
7247b14bd9 FIX Lines are not inserted correctly if VAT have code 2018-12-03 12:28:17 +01:00
Ferran Marcet
135a94dfed Merge branch '7.0up' into 7.0 2018-12-03 11:59:46 +01:00
Ferran Marcet
8312d57d16 FIX Lines are not inserted correctly if VAT have code 2018-12-03 11:58:39 +01:00
Regis Houssin
2d8494050f FIX scrutinizer 2018-12-03 11:21:49 +01:00
aurelien goudeneche
1f089d3ee2
Update pay.php 2018-12-03 09:37:45 +01:00
aurelien goudeneche
41ee56c9e9
Apply andreubisquerra's fix to cheque payment 
Apply andreubisquerra's fix (#10147) to cheque payment button
 2018-12-03 09:30:47 +01:00
aurelien goudeneche
86ea0f523b
Merge pull request #2 from Dolibarr/develop 
update fork
 2018-12-03 08:50:50 +01:00
Regis Houssin
1de8ca7cf7 Merge remote-tracking branch 'regis/develop_mc' into develop_mc 2018-12-03 08:48:34 +01:00
Regis Houssin
8953a3ed73 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into 
develop_mc

Conflicts:
	ChangeLog
 2018-12-03 08:46:03 +01:00
Alexandre SPANGARO
b69b189352 Merge remote-tracking branch 'upstream/develop' into develop 2018-12-02 21:16:30 +01:00
Maxime Kohlhaas
8fea6338e1 Fix #6565 
Fix pdf footer height for all documents
 2018-12-02 18:51:49 +01:00
Maxime Kohlhaas
42c97cf7d5 Fix #6610 2018-12-02 17:59:11 +01:00
Maxime Kohlhaas
2e496ea83a QUAL rename facnumber by ref 2018-12-02 17:33:44 +01:00
Laurent Destailleur
7c46ace042
Merge pull request #10153 from atm-maxime/fix_user_photo 
Fix user photo path
 2018-12-02 17:07:14 +01:00
Laurent Destailleur
07425e4e19
Merge pull request #10156 from grandoc/7.0_bug 
FIX #3234
 2018-12-02 17:06:06 +01:00
Laurent Destailleur
70f29d9d79
Merge pull request #10155 from frederic34/patch-2 
GETPOSTISSET has only one param
 2018-12-02 17:04:55 +01:00
Laurent Destailleur
7b1aec1e2a
Merge pull request #10157 from frederic34/memberdoc 
doc comment adherent class
 2018-12-02 17:04:30 +01:00
Laurent Destailleur
168f374ff5
Merge pull request #10159 from defrance/patch-136 
Warning error if $conf->browser->layout is empty
 2018-12-02 17:03:34 +01:00
Laurent Destailleur
ea119a26c7
Update ajax.lib.php 2018-12-02 17:03:11 +01:00
Juanjo Menent
4b785b22f6 Merge remote-tracking branch 'upstream/7.0' into 7.0 2018-12-02 15:53:14 +01:00
Juanjo Menent
aa2ecd4b73
Merge pull request #10162 from aljawaid/aljawaid-ecm_translations 
FIX: Add Missing Translation Strings into ecm.lang
 2018-12-02 15:51:40 +01:00
Alexandre SPANGARO
7eee155439 Correct documentation 2018-12-02 14:07:38 +01:00
IJ
cefa818646
Merge pull request #3 from aljawaid/aljawaid-ecm_translations 
FIX: Add Missing Translation Strings into ecm.lang
 2018-12-02 12:30:38 +00:00
IJ
30f1925177
FIX: Add Missing Translation Strings into ecm.lang 
- ECMDocsByHolidays
- ECMDocsBySupplierProposals
 2018-12-02 12:29:52 +00:00
IJ
30e84f8f2c
Amend Add Access Keys in Navigation Tooltips 
- based on suggested code by @eldy
- Added `classfortooltip` for better display
 2018-12-02 10:29:04 +00:00
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