Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-27 03:41:31 +01:00
Code Issues Packages Projects Releases Wiki Activity
77,508 Commits 36 Branches 191 Tags
bf2d052d624a34be524b3ec4f84fa8d66eb2fd65
Commit Graph

77508 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Abbes Bahfir
bf2d052d62 Fix:syntax error in sql query 2019-07-31 17:48:17 +01:00
Laurent Destailleur
a7390e7e47 Merge pull request #11396 from ATM-Consulting/New_retained_warranty_develop 
NEW Management of retained warranty on situation invoices
 2019-07-30 21:53:09 +02:00
Laurent Destailleur
9a60fac9d1 Merge pull request #11564 from simnandez/develop 
NEW: Add hidden option for update supplier buying in receptions
 2019-07-30 21:43:03 +02:00
Laurent Destailleur
aba9eafeea Update dispatch.php 2019-07-30 21:42:53 +02:00
Laurent Destailleur
cd07596b27 Merge pull request #11565 from ptibogxiv/patch-199 
Fix application_fee name stripe.class.php
 2019-07-30 21:34:19 +02:00
Laurent Destailleur
4bda18fd4d Merge pull request #11568 from joseplluis/patch-7 
FIX: move doActions hook before standard actions
 2019-07-30 21:08:12 +02:00
Laurent Destailleur
dca775985f Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2019-07-30 20:55:41 +02:00
Laurent Destailleur
34f78c555d Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-07-30 20:55:35 +02:00
Laurent Destailleur
192fb45ce7 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 
Conflicts:
	htdocs/accountancy/bookkeeping/card.php
	htdocs/accountancy/bookkeeping/list.php
	htdocs/adherents/card.php
	htdocs/compta/sociales/list.php
	htdocs/compta/sociales/payments.php
	htdocs/core/modules/import/import_csv.modules.php
	htdocs/core/modules/import/import_xlsx.modules.php
	htdocs/holiday/class/holiday.class.php
	htdocs/viewimage.php
 2019-07-30 20:55:15 +02:00
Laurent Destailleur
cb07d80681 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-07-30 20:37:55 +02:00
Laurent Destailleur
5f2439bf0a Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-07-30 20:37:44 +02:00
Laurent Destailleur
0ab16b739a Add more log and phpunit 2019-07-30 20:37:07 +02:00
Laurent Destailleur
9e622fe042 Merge pull request #11572 from atm-maxime/fix_holiday_update_solde 
Fix holiday counter auto update
 2019-07-30 20:12:30 +02:00
Laurent Destailleur
ea92ba2a78 Update holiday.class.php 2019-07-30 20:11:43 +02:00
Laurent Destailleur
00a4359508 FIX list of balance of leaves 2019-07-30 19:56:10 +02:00
Vaadasch
23bca6f4cd Change "DOCUMENT_URI" to "PHP_SELF" 
DOCUMENT_URI works with Apache. To be compliant with Nginx and probably some others, use PHP_SELF
 2019-07-30 19:40:28 +02:00
Laurent Destailleur
2a447fad1d Merge pull request #11574 from Vaadasch/patch-1 
FIX Change "DOCUMENT_URI" to "PHP_SELF"
 2019-07-30 19:39:59 +02:00
Vaadasch
1600ecc9ec Change 0 and 1 to FALSE and TRUE for pgsql 
0 and 1 are read as False and True by Mysql, but not by PGsql.
FALSE and TRUE are correctly read by both => changing
 2019-07-30 19:35:03 +02:00
Laurent Destailleur
1fc4db28c6 Merge pull request #11577 from Vaadasch/patch-2 
Change 0 and 1 to FALSE and TRUE for pgsql
 2019-07-30 19:34:34 +02:00
Laurent Destailleur
e54c6fb5e2 FIX #11460 FIX #11492 FIX #11576 FIX #11590 2019-07-30 19:30:56 +02:00
Laurent Destailleur
d3b6411458 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2019-07-30 18:15:19 +02:00
Laurent Destailleur
a871aa818b FIX #11460 FIX #11492 FIX #11576 FIX #11590 2019-07-30 18:15:04 +02:00
Laurent Destailleur
a5e0dd56f4 Merge pull request #11580 from aspangaro/9.0_FEC 
FIX FEC Format - Save translation of the journal label in database & nowrap on amount
 2019-07-30 16:10:32 +02:00
Laurent Destailleur
5cbde99871 Merge pull request #11579 from atm-maxime/new_withdraw_date_rum 
NEW Can edit date or RUM mandate
 2019-07-30 16:04:57 +02:00
Laurent Destailleur
a7a2e483c9 Update paymentmodes.php 2019-07-30 16:01:26 +02:00
Laurent Destailleur
334e1a6737 Merge pull request #11583 from aspangaro/11.0_LDcompta 
NEW Accountancy Add export model LDCompta V9 & higher
 2019-07-30 15:59:43 +02:00
Laurent Destailleur
78b92291a7 Merge pull request #11582 from aspangaro/10.0_adh 
FIX Language key
 2019-07-30 15:58:46 +02:00
Laurent Destailleur
941b2c5325 Merge pull request #11581 from aspangaro/9.0_adh 
FIX Language key
 2019-07-30 15:58:30 +02:00
Laurent Destailleur
c080878083 Merge pull request #11585 from ATM-Marc/FIX_9.0_expedition_printObjectLine_loop 
FIX: expedition card: infinite loop for printObjectLine hook if return > 0
 2019-07-30 15:58:09 +02:00
Laurent Destailleur
24695a9112 Merge pull request #11595 from ATM-Marc/FIX_8.0_import_bad_categories 
FIX: categories import: prevent mismatch between category type and object type
 2019-07-30 15:56:36 +02:00
Laurent Destailleur
6c49ab2049 Merge pull request #11588 from joseplluis/patch-8 
FIX: resource tpls directories
 2019-07-30 15:50:56 +02:00
Laurent Destailleur
bb885cadf2 Merge pull request #11563 from atm-quentin/FIX_sociales_redirect_index 
FIX wrong path sociales/index.php doesnt exist anymore
 2019-07-30 15:43:42 +02:00
ptibogxiv
5b1a89bf94 Fix php error with const 2019-07-30 15:42:37 +02:00
Laurent Destailleur
a978372383 Merge pull request #11594 from ptibogxiv/patch-201 
Fix php error with const
 2019-07-30 15:42:10 +02:00
Laurent Destailleur
7889c64438 Merge pull request #11589 from ptibogxiv/patch-200 
FIX  stripe webhook ID constant set
 2019-07-30 15:41:32 +02:00
Laurent Destailleur
5ef5c5521f Merge pull request #11597 from atm-florianm/8.0-FIX_missing_prefix_replacement_in_database_function_initialization 
FIX issue #9300: install error with PostgreSQL using custom table prefix
 2019-07-30 15:38:22 +02:00
Laurent Destailleur
db69a07bc4 FIX Option THIRDPARTY_SUGGEST_ALSO_ADDRESS_CREATION 2019-07-30 15:21:26 +02:00
Marc de Lima Lucio
703506c0e2 FIX: import filter error 2019-07-30 14:11:21 +02:00
Florian Mortgat
de293c4ef2 FIX issue #9300: install error with PostgreSQL when using custom table prefix 2019-07-30 14:09:03 +02:00
Laurent Destailleur
6aefa648e7 FIX CVE-2019-11199 2019-07-30 14:00:43 +02:00
Marc de Lima Lucio
449ef92007 FIX: categories import: prevent mismatch between category type and object type 2019-07-30 12:31:03 +02:00
ptibogxiv
5880d549fb Fix php error with const 2019-07-30 11:55:46 +02:00
Laurent Destailleur
10344d9c34 Try to use the new scrutinizer engine 2019-07-30 02:24:04 +02:00
ptibogxiv
d2bc3ac1ef FIX stripe webhook ID constant set 2019-07-29 18:34:21 +02:00
Josep Lluís
567c4bf97b FIX: resource tpls directories 
search resource tpls also in custom modules directories
 2019-07-29 18:17:48 +02:00
Alexandre SPANGARO
96380f01c6 Test in progress 2019-07-29 15:41:53 +02:00
Marc de Lima Lucio
87fc3c3968 FIX: expedition card: infinite loop for printObjectLine hook if return > 0 2019-07-29 13:56:35 +02:00
Laurent Destailleur
11e3aa5860 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-07-29 11:07:11 +02:00
Laurent Destailleur
7931f0b422 Fix sql error 2019-07-29 11:06:39 +02:00
Laurent Destailleur
f825711206 Code comment 2019-07-29 11:01:29 +02:00