Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-15 14:01:22 +01:00
Code Issues Packages Projects Releases Wiki Activity
68,451 Commits 36 Branches 190 Tags
4d8e5ab0e6ce8e77e2286f59319b901b9e8d0460
Commit Graph

14494 Commits

Author SHA1 Message Date
Laurent Destailleur
2dbb6e258b FIX Can filter on month in export of blockedlog 
FIX Fingerprint correct in popup
 2018-08-09 22:29:02 +02:00
florian HENRY
06189f8153 Merge branch '6.0' into 6.0_fhe 2018-08-09 18:31:59 +02:00
florian HENRY
9024ed9e61 Merge branch '7.0' into 7.0_fhe 2018-08-09 17:47:21 +02:00
Frédéric FRANCE
79aaddbb66 test phpcs v3 2018-08-09 14:46:00 +02:00
Laurent Destailleur
61d7629ab1 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/comm/propal/list.php
 2018-08-08 17:44:22 +02:00
Laurent Destailleur
8d54df4263 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 
Conflicts:
	htdocs/core/modules/commande/doc/pdf_einstein.modules.php
	htdocs/core/modules/facture/doc/pdf_crabe.modules.php
	htdocs/core/modules/propale/doc/pdf_azur.modules.php
 2018-08-08 17:31:23 +02:00
Laurent Destailleur
d79778a67e Fix reponsive 2018-08-08 17:00:16 +02:00
pa-de-solminihac
fc5481fb1d FIX massaction builddoc: include PDF files created from an ODT template too 2018-08-08 12:04:10 +02:00
Juanjo Menent
948bb47040 Merge pull request #9207 from atm-florian/dev_showadressinthirdpartylistoption 
NEW: Add option to display thirdparty adress in combolist
 2018-08-08 11:14:22 +02:00
Juanjo Menent
e2499392a9 Merge pull request #9215 from fmarcet/7.0 
Fix: Bad position when document have incoterms/notes
 2018-08-08 11:10:47 +02:00
Juanjo Menent
1dbec93144 Merge pull request #9216 from atm-gauthier/NEW_tag_fourn 
NEW : tag odt line_product_ref_fourn for supplier doc lines
 2018-08-08 11:09:01 +02:00
gauthier
a2a8929d0e NEW : tag odt line_product_ref_fourn for supplier doc lines 2018-08-07 11:45:56 +02:00
Ferran Marcet
5ce31f65a4 Fix: Bad position when document have incoterms/notes 2018-08-07 11:40:11 +02:00
Philippe GRAND
42fe2b78de clean and update code 2018-08-07 10:44:26 +02:00
ATM-Nicolas
5b15e688af FIX : PHP warning, undefined index notnull 2018-08-07 09:38:18 +02:00
florian HENRY
45a52a955e NEW: Add optoin to display thirdparty adress in combolist 2018-08-06 10:52:10 +02:00
florian HENRY
0d85eb52c5 Merge branch '7.0' of https://github.com/Dolibarr/dolibarr.git into 7.0 2018-08-03 17:10:26 +02:00
florian HENRY
615ed11534 fix bad use of test_sql_and_script_inject return int not value tested 2018-08-03 17:09:58 +02:00
atm-quentin
c97e2db089 Merge branch '7.0' of github.com:Dolibarr/dolibarr into FIX_hook_update_price 2018-08-03 11:49:00 +02:00
atm-quentin
6662bf05ba FIX hook on update price AND fix id on line 2018-08-03 11:47:43 +02:00
ATM-Nicolas
70adfb135d FIX : Missing behavior 2018-08-03 09:51:29 +02:00
Laurent Destailleur
b01f07efda Merge branch 'develop' into FIX_project_overview 2018-08-02 18:43:55 +02:00
Laurent Destailleur
e106fda5e6 Merge pull request #9113 from torvista/export-import 
Fix for Warning: A non-numeric value encountered in bank.lib.php on line 359
 2018-08-02 18:38:46 +02:00
Laurent Destailleur
0e3473701a Update bank.lib.php 2018-08-02 18:38:33 +02:00
ATM-Nicolas
f3090e4819 FIX : Wrong variable and trigger name 2018-08-02 16:05:54 +02:00
Juanjo Menent
788060aa28 Merge pull request #9178 from aspangaro/9.0_a3 
NEW : Add project on salaries
 2018-08-02 11:19:34 +02:00
Juanjo Menent
37a9a2df56 Merge pull request #9167 from frederic34/include 
Include and co are statements
 2018-08-02 11:03:44 +02:00
Juanjo Menent
79a13403ae Merge pull request #9162 from frederic34/extratotalize 
NEW: Extrafield totalizable
 2018-08-02 10:59:46 +02:00
florian HENRY
ceb85cfa45 fix : odt project and task extrafields management 2018-07-31 17:29:08 +02:00
gauthier
cadf931e8d FIX : extrafieldkey 2018-07-31 15:02:51 +02:00
John BOTELLA
4ddca02bb9 fix situation line's total 2018-07-31 14:58:33 +02:00
ATM-Nicolas
b9a44fc76b FIX : Wrong position of firstname lastname 2018-07-31 12:15:18 +02:00
atm-quentin
37a4a0c488 fix for travis 2018-07-31 10:02:36 +02:00
Alexandre SPANGARO
0509a176ca Merge branch 'develop' into 9.0_a3 2018-07-31 07:47:43 +02:00
Alexandre SPANGARO
b0e2e69ed0 New : Add project on salaries 2018-07-31 07:45:03 +02:00
Laurent Destailleur
7af42c66cc Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 
Conflicts:
	htdocs/comm/propal/list.php
 2018-07-27 12:54:45 +02:00
Laurent Destailleur
83ae27d122 FIX Deletion of files in migration 2018-07-27 12:33:36 +02:00
Frédéric FRANCE
a0a5d33641 test include 2018-07-26 17:30:53 +02:00
atm-quentin
1297470c99 FIX project overview (can use any fields as fk_projet) 2018-07-26 15:05:32 +02:00
Frédéric FRANCE
2dd907a8e1 extrafield totalizable 2018-07-26 09:41:44 +02:00
Philippe GRAND
7d5464cfbc Clean and update code 2018-07-25 15:25:23 +02:00
Laurent Destailleur
dc2fec8f57 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-07-24 19:37:04 +02:00
Laurent Destailleur
7821e21e5b Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2018-07-24 19:23:51 +02:00
Laurent Destailleur
d871b8964f Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2018-07-24 19:23:40 +02:00
Laurent Destailleur
20f178fdfe Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 
Conflicts:
	htdocs/comm/action/index.php
	htdocs/core/lib/functions.lib.php
 2018-07-24 19:22:00 +02:00
Laurent Destailleur
77c121b15c Merge pull request #9099 from ATM-Nicolas/7.0 
NEW Set contactCivName substitution key
 2018-07-24 18:02:21 +02:00
Laurent Destailleur
2b7735ec71 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-07-24 17:06:55 +02:00
Laurent Destailleur
7e9a2c5ec7 Fix #9092 2018-07-24 17:06:41 +02:00
Laurent Destailleur
c1002e7b41 Merge pull request #9123 from atm-maxime/new_timespent_numeric 
NEW Allow to enter a timespent with a numeric value
 2018-07-24 16:58:24 +02:00
Laurent Destailleur
3bdf7d411d Merge pull request #9125 from atm-john/fix_php7_warning_mysql 
Fix: Warning: Use of undefined constant MYSQL_NUM - assumed 'MYSQL_NU…
 2018-07-24 16:56:10 +02:00