Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2026-02-13 19:25:22 +01:00
Code Issues Packages Projects Releases Wiki Activity
65,724 Commits 39 Branches 191 Tags
0668f90e1401fddfa196fbf75fa547fbd8f4e5b6
Commit Graph

65724 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Maxime Kohlhaas
5e2f3a53c9 Fix expense report in ecm auto dir 2018-12-01 19:39:00 +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
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
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
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
3ea69cb1f1 Merge pull request #10130 from inoveaconseil/patch-3 
Fix #9572
 2018-12-01 16:22:38 +01:00
Inovea Conseil
0ba5fda3da Update price.php 2018-12-01 16:11:49 +01:00
Inovea Conseil
8964ec7ea1 Fix #9572 
Fix #9572
 2018-12-01 15:58:37 +01:00
Laurent Destailleur
305ab85f5d Merge pull request #10114 from frederic34/patch-17 
Update 6.0.0-7.0.0.sql #8723
 2018-12-01 14:54:31 +01:00
Juanjo Menent
6104d16b08 Merge pull request #10117 from atm-maxime/fix_pdf_contract 
Fix pdf strato for contract with multipage
 2018-12-01 11:14:38 +01:00
Maxime Kohlhaas
2b5bf0e2dd Fix pdf strato for contract with multipage 2018-12-01 01:07:15 +01:00
Frédéric FRANCE
335327827d Update 6.0.0-7.0.0.sql 2018-12-01 00:34:17 +01:00
Juanjo Menent
d1df592c7e Merge pull request #10110 from atm-maxime/fix_supp_pay_specimen 
Fix #9074
 2018-11-30 23:57:49 +01:00
Juanjo Menent
859d6c4401 Merge pull request #10109 from atm-maxime/fix_dupl_code 
Fix #9070
 2018-11-30 23:57:32 +01:00
Juanjo Menent
6d8f3aedc3 Merge pull request #10107 from atm-maxime/fix_import_extrafields 
Fix extrafields in import tool
 2018-11-30 23:56:57 +01:00
Maxime Kohlhaas
e8a02a971d Fix #9074 2018-11-30 23:05:12 +01:00
Maxime Kohlhaas
7585461486 Fix #9070 2018-11-30 22:16:17 +01:00
Maxime Kohlhaas
5dcb3d2a1f Fix extrafields in import tool 2018-11-30 19:23:05 +01:00
Laurent Destailleur
d8ab614efb Merge pull request #10088 from ATM-Marc/FIX_7.0_select_type_actions 
FIX: form actions: select_type_actions could be too small + bad $db init
 2018-11-29 11:16:57 +01:00
Marc de Lima Lucio
c13cc5d697 FIX: form actions: select_type_actions could be too small + bad init 2018-11-28 15:46:27 +01:00
Laurent Destailleur
fe4d8e36be Merge pull request #10072 from fappels/7.0_fix_expensereport_paid 
Fix expensereport class fetch method
 2018-11-24 11:06:47 +01:00
fappels
322ce410d7 Add missing paid field in fetch sql 2018-11-23 09:42:43 +01:00
Laurent Destailleur
8535844737 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 2018-11-19 18:27:00 +01:00
Laurent Destailleur
bd8856b988 Merge pull request #10033 from frederic34/patch-9 
Update CMailFile.class.php
 2018-11-19 18:20:20 +01:00
Laurent Destailleur
7a3f088fcb Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 2018-11-19 18:19:11 +01:00
Laurent Destailleur
77bc1c4313 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 
Conflicts:
	htdocs/core/actions_massactions.inc.php
 2018-11-19 18:18:43 +01:00
Laurent Destailleur
fcb9b693cf Merge pull request #10042 from atm-gauthier/6.0_fix_massaction_sendinvoicebymail 
FIX : We want to be able to send PDF of paid invoices
 2018-11-19 18:14:12 +01:00
Laurent Destailleur
1e50e0576b Merge pull request #10039 from atm-florian/7.0 
fix list agenda extrafield visibility
 2018-11-19 18:09:21 +01:00
gauthier
ecdfa5219b FIX : We want to be able to send PDF of paid invoices 2018-11-19 17:31:45 +01:00
florian HENRY
dc2f1e9812 fix list agenda extrafield visibility 2018-11-19 11:25:48 +01:00
Frédéric FRANCE
30b1db34cd Update CMailFile.class.php 2018-11-17 11:33:01 +01:00
Laurent Destailleur
f2bbb54b8f Merge pull request #10011 from atm-gauthier/7.0_fix_search_categ_product_on_supplierorderlist 
FIX : filter on product category doesn't work
 2018-11-15 16:44:40 +01:00
Laurent Destailleur
1b377c0c48 Merge pull request #10004 from atm-gauthier/7.0_fix_payment_modes 
FIX : fourn payment modes musn't be available on customer docs
 2018-11-15 16:28:26 +01:00
gauthier
85dd0ec2dd FIX : filter on product category doesn't work 2018-11-13 15:24:53 +01:00
gauthier
f404cae546 FIX : Same on customer card 2018-11-12 16:04:42 +01:00
gauthier
66ea8bbe87 FIX : fourn payment modes musn't be available on customer docs 2018-11-12 15:58:41 +01:00
Laurent Destailleur
7f79bb1ffb Merge pull request #10002 from tarrsalah/fix-sql-performance-on-create-supplier-invoice 
FIX slow SQL query on creating a new supplier invoice
 2018-11-12 12:54:05 +01:00
tarrsalah
5eb897e049 FIX sql query performance on list_qualified_avoir_supplier_invoices. 2018-11-12 12:11:40 +01:00
Laurent Destailleur
c492b3328b Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 2018-11-10 15:50:00 +01:00
Laurent Destailleur
edc59b9290 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 2018-11-10 15:49:20 +01:00
Laurent Destailleur
24c499aa44 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0 2018-11-10 15:48:53 +01:00
Laurent Destailleur
8eac45a762 Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0 2018-11-10 15:48:07 +01:00
Laurent Destailleur
3d85407619 Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.9 2018-11-10 15:46:31 +01:00
Laurent Destailleur
ca1e3b4d55 Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.8 2018-11-10 15:15:33 +01:00
Laurent Destailleur
94bb1ac511 Merge branch '3.6' of git@github.com:Dolibarr/dolibarr.git into 3.7 2018-11-10 12:49:22 +01:00
Laurent Destailleur
8893d8d59f Fix compatiblity with new version of PHP 2018-11-10 11:56:23 +01:00