lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
90,935 Commits 43 Branches 150 Tags 886 MiB
244f74ddfe
Commit Graph

90935 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Laurent Destailleur
244f74ddfe
Merge pull request #15162 from FHenry/develop 
fix bad link index thirdparty
 2020-10-26 19:12:23 +01:00
Laurent Destailleur
8051db9ad8 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-10-26 19:09:16 +01:00
Laurent Destailleur
0abce469e9 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-10-26 19:09:08 +01:00
Laurent Destailleur
f18a13b2d4 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 
Conflicts:
	htdocs/product/class/productcustomerprice.class.php
 2020-10-26 19:08:11 +01:00
Laurent Destailleur
78a52eda96 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 
Conflicts:
	htdocs/main.inc.php
	htdocs/product/class/productcustomerprice.class.php
 2020-10-26 19:05:30 +01:00
Laurent Destailleur
50ede5224a Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2020-10-26 19:02:47 +01:00
Laurent Destailleur
c58d3d0cf7 FIX #15163 2020-10-26 19:02:26 +01:00
Laurent Destailleur
ca66df2a7b
Merge pull request #15167 from marc-dll/FIX_10.0_customer_price_triggers 
FIX: product customer prices: missing triggers in CRUD class
 2020-10-26 18:59:44 +01:00
Laurent Destailleur
5e2b0a98cc
Merge pull request #15170 from fappels/13_set_date_livraison 
Re-add set_date_livraison as a deprecated function.
 2020-10-26 18:57:17 +01:00
Laurent Destailleur
130591480a
Merge pull request #15171 from frederic34/cleantriggers 
clean triggers
 2020-10-26 18:54:54 +01:00
Laurent Destailleur
3e050eba8c
Merge pull request #15172 from fappels/13_fix_reception 
Fix reception fetch_lines
 2020-10-26 18:53:15 +01:00
Frédéric FRANCE
9c51d467b5
clean triggers 2020-10-26 18:49:38 +01:00
Frédéric FRANCE
360ea91be5
clean triggers 2020-10-26 18:46:03 +01:00
Francis Appels
b6142dded6 Remove phpcs disable enable from setDeliveryDate in delivery class 2020-10-26 18:40:24 +01:00
Frédéric FRANCE
66fbddb892
clean triggers 2020-10-26 18:35:27 +01:00
Frédéric FRANCE
3e686e167c
clean triggers 2020-10-26 18:31:45 +01:00
Laurent Destailleur
3ee618d736 FIX Clean orphan records in llx_ecm_files into repair script. 2020-10-26 18:31:12 +01:00
Francis Appels
1ba0e92c41 Fix reception fetch_lines 2020-10-26 18:30:32 +01:00
Francis Appels
93ab281d81 Fix tab indent 2020-10-26 18:21:47 +01:00
Laurent Destailleur
efce53abd1 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/boxes/box_services_contracts.php
	htdocs/expensereport/class/expensereport.class.php
 2020-10-26 18:17:23 +01:00
Laurent Destailleur
2c2142ddba Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2020-10-26 18:13:47 +01:00
Francis Appels
91496682fb Merge branch '13_set_date_livraison' of github.com:fappels/dolibarr into 13_set_date_livraison 2020-10-26 18:13:36 +01:00
Francis Appels
3ff6f6a04a Move phpcs enable to correct location @frederic34 2020-10-26 18:13:25 +01:00
Laurent Destailleur
adeddc70ca FIX Deletion of expensereport + other generated object not complete. 2020-10-26 18:10:58 +01:00
stickler-ci
d803c7f429 Fixing style errors. 2020-10-26 16:06:05 +00:00
Francis Appels
fa8e4a9bb0 No trigger for supplier proposal 2020-10-26 17:02:33 +01:00
Francis Appels
d6839ddca6 No trigger for expedition 2020-10-26 16:59:25 +01:00
Francis Appels
7fa7f0a390 Re-add set_date_livraison as a deprecated function. 
Use correct naming convention for new method naming.
 2020-10-26 16:50:52 +01:00
Marc de Lima Lucio
3f839c2a96 FIX: product customer prices: missing triggers in CRUD class 2020-10-26 16:11:21 +01:00
Laurent Destailleur
82db2636f0 Fix phpcs 2020-10-26 13:22:03 +01:00
Florian HENRY
457f8b9766 fix bad link index thirdparty 2020-10-26 10:49:07 +01:00
Laurent Destailleur
858c48bd15 Fix 2020-10-25 22:12:16 +01:00
Laurent Destailleur
2026705045 Start beta 2020-10-25 21:47:50 +01:00
Laurent Destailleur
2638d4596a Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/facture/card.php
	htdocs/core/actions_sendmails.inc.php
	htdocs/core/class/commonobject.class.php
	htdocs/fourn/class/fournisseur.facture.class.php
	htdocs/fourn/facture/card.php
 2020-10-25 21:33:13 +01:00
Laurent Destailleur
9dfc08d2bd Fix bad var name 2020-10-25 21:11:05 +01:00
Laurent Destailleur
ec0da6921a Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2020-10-25 21:10:00 +01:00
Laurent Destailleur
6bc0630c5f Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 
Conflicts:
	htdocs/core/boxes/box_services_contracts.php
 2020-10-25 21:09:43 +01:00
Laurent Destailleur
baa86d773b Fix phpcs 2020-10-25 21:07:37 +01:00
Laurent Destailleur
6c1f60f6c0 Fix regression 2020-10-25 17:19:15 +01:00
Laurent Destailleur
8578a7cd7c Fix regressions 2020-10-25 17:02:25 +01:00
Laurent Destailleur
cd4d738a56 Merge branch 'translateModLivraison2ModDelivery' of 
https://github.com/orebd/dolibarr into develop

# Conflicts:
#	htdocs/install/mysql/migration/12.0.0-13.0.0.sql
 2020-10-25 16:01:18 +01:00
Laurent Destailleur
70082d17b4 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-10-25 15:22:35 +01:00
Laurent Destailleur
859fea626d Use more generic domain 2020-10-25 15:22:23 +01:00
Laurent Destailleur
f7e1071e8e
Merge pull request #15073 from SwikritiT/develop 
[Tests-only] Added API tests for list users feature
 2020-10-25 15:19:01 +01:00
Laurent Destailleur
6fa174d13f
Merge pull request #15051 from laudeco/feature/11878_select_bank_account 
11878 - select the only bank account
 2020-10-25 14:56:08 +01:00
Laurent Destailleur
dbf626b92b
Update html.form.class.php 2020-10-25 14:55:52 +01:00
Laurent Destailleur
36854b0af4
Merge pull request #15123 from frederic34/patch-8 
fix unknown function
 2020-10-25 14:51:42 +01:00
Laurent Destailleur
80bbec7aeb
Merge pull request #15122 from frederic34/publicmember 
add hook on public new member card
 2020-10-25 14:51:14 +01:00
Laurent Destailleur
e7743948cb
Merge pull request #15120 from frederic34/patch-6 
Update commonobject.class.php
 2020-10-25 14:50:56 +01:00
Laurent Destailleur
b80d135fcb
Merge pull request #15119 from FHenry/12.0_fix_mailerrormessage 
fix mail error message
 2020-10-25 14:50:23 +01:00