Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-29 21:01:25 +01:00
Code Issues Packages Projects Releases Wiki Activity
72,072 Commits 37 Branches 191 Tags
afee39ea68ea5eaad940149d6bf0fad1294de229
Commit Graph

63009 Commits

Author SHA1 Message Date
Norbert Penel
b4475e434f Events are not linked to products 
when created from a product card, the events are not linked to the product
 2018-12-05 15:18:45 +01:00
IJ
8bd2efe648 NEW: Add Hidden Config 'OVERRIDE_VAT_FOR_EXPENSE_REPORT' 
- Setting constant `OVERRIDE_VAT_FOR_EXPENSE_REPORT` to `1` will allow expense reports to show VAT even if the global VAT setting is off
 2018-12-05 12:36:46 +00:00
fappels
6d27a6458e Fix travis 2018-12-05 11:10:42 +01:00
fappels
d1d41f4dd4 New add payments table to pdf expense report 2018-12-04 23:16:41 +01:00
Laurent Destailleur
5ce26bae1b Fix form of bank info for CH 2018-12-04 22:01:35 +01:00
Laurent Destailleur
f142238817 Fix missing field canvas 2018-12-04 21:25:59 +01:00
Laurent Destailleur
6d093b03f6 Code comment 2018-12-04 18:07:02 +01:00
Philippe GRAND
e9e6d8b9b5 Fix: bug :The method _tab_signature() does not seem to exist on object<pdf_strato> 2018-12-04 16:10:56 +01:00
Laurent Destailleur
232875f105 Prepare 10.0 2018-12-04 16:09:49 +01:00
Laurent Destailleur
b359afd084 Prepare 9.0 2018-12-04 16:08:36 +01:00
Laurent Destailleur
96b27a3a67 Merge pull request #10175 from grandoc/new_branch_04_12_2018 
Fix: bug :The method _tab_signature() does not seem to exist on objec…
 2018-12-04 15:35:44 +01:00
Laurent Destailleur
bdc4893aad Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-12-04 14:58:26 +01:00
Laurent Destailleur
138640fc63 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/commande/class/commande.class.php
	htdocs/contrat/class/contrat.class.php
	htdocs/expensereport/class/expensereport.class.php
	htdocs/fourn/class/fournisseur.commande.class.php
 2018-12-04 14:58:11 +01:00
Laurent Destailleur
8e333c3feb Standardize code 2018-12-04 14:54:58 +01:00
Laurent Destailleur
d80baaea69 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 
Conflicts:
	htdocs/comm/propal/class/propal.class.php
	htdocs/commande/class/commande.class.php
	htdocs/contrat/class/contrat.class.php
	htdocs/expensereport/class/expensereport.class.php
	htdocs/fourn/class/fournisseur.commande.class.php
	htdocs/fourn/class/fournisseur.facture.class.php
 2018-12-04 14:29:47 +01:00
Philippe GRAND
c113a7ca3b Fix: bug :The method _tab_signature() does not seem to exist on object<pdf_strato> 2018-12-04 14:04:02 +01:00
Laurent Destailleur
779d33cf02 Merge pull request #10085 from fmarcet/7.0 
FIX Lines are not inserted correctly if VAT have code
 2018-12-04 13:55:57 +01:00
Laurent Destailleur
d2e8aeb8c1 Merge pull request #10173 from hregis/develop_upgrade 
FIX wrong path, multidir_output[] for each entity is construct by the multicompany module
 2018-12-04 13:39:05 +01:00
Laurent Destailleur
c27c322457 Merge pull request #10172 from hregis/develop_virtualmin 
FIX possibility to force install lock with GET/POST or script
 2018-12-04 13:38:23 +01:00
Laurent Destailleur
a87978eca4 Merge pull request #10168 from AurelGDN/develop 
Fix: Apply andreubisquerra's fix to cheque payment
 2018-12-04 13:35:42 +01:00
Laurent Destailleur
b67ed87103 Merge pull request #10166 from atm-maxime/fix_pdf_footer 
Fix pdf footer height for all documents
 2018-12-04 13:35:11 +01:00
Laurent Destailleur
1d9c0f6b77 Fix look and feel 2018-12-04 13:26:19 +01:00
Laurent Destailleur
d9bb39970f Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/admin/barcode.php
 2018-12-04 13:20:40 +01:00
Laurent Destailleur
5061a9b0c2 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 
Conflicts:
	htdocs/install/mysql/tables/llx_paiementfourn.sql
 2018-12-04 13:17:25 +01:00
Laurent Destailleur
347384734d Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 
Conflicts:
	htdocs/install/mysql/tables/llx_paiementfourn.sql
 2018-12-04 13:15:32 +01:00
Laurent Destailleur
275eeca135 Trans 2018-12-04 13:09:58 +01:00
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
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
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