lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
94,647 Commits 43 Branches 150 Tags 886 MiB
4c17fefb95
Commit Graph

94647 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Frédéric FRANCE
4c17fefb95
Update CompanyBankAccountTest.php 2021-02-09 23:54:53 +01:00
Frédéric FRANCE
9db3499aef
Update CommonInvoiceTest.php 2021-02-09 23:52:53 +01:00
Frédéric FRANCE
db8afec96b
Update CommandeTest.php 2021-02-09 23:51:49 +01:00
Frédéric FRANCE
763b8f071e
Update CommandeFournisseurTest.php 2021-02-09 23:50:40 +01:00
Frédéric FRANCE
f1ce1ed9c8
Update BankAccountTest.php 2021-02-09 23:48:28 +01:00
Frédéric FRANCE
62bfb73423
Update ActionCommTest.php 2021-02-09 23:46:26 +01:00
Frédéric FRANCE
7bbd89393a
doxygen 2021-02-09 23:45:23 +01:00
Laurent Destailleur
52ee530e70 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-02-09 22:03:38 +01:00
Laurent Destailleur
3a9cf8eb7a FIX: ODT generation very slow 2021-02-09 22:02:48 +01:00
Laurent Destailleur
beb9f4f1e9 Fix 2 lines on one line when there is 2 or more sale representatives 2021-02-09 21:35:50 +01:00
Laurent Destailleur
d588086c47 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-02-09 21:21:28 +01:00
Laurent Destailleur
032503f397 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/main.inc.php
 2021-02-09 21:13:54 +01:00
Laurent Destailleur
9c535d6d7e Fix comment in js must be a js comment 2021-02-09 21:09:46 +01:00
Laurent Destailleur
0e2c27d795 Fix javascript error 2021-02-09 21:06:11 +01:00
Laurent Destailleur
e1af57f540 FIX status late on purchase orders 2021-02-09 20:46:17 +01:00
Laurent Destailleur
eae232da50 Fix sql error 2021-02-09 19:16:26 +01:00
Laurent Destailleur
92a19c0caa Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	ChangeLog
 2021-02-09 18:34:50 +01:00
Laurent Destailleur
fdc2a88fc0 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 2021-02-09 18:30:47 +01:00
Laurent Destailleur
e2d1813451 Fix column title wrapped 2021-02-09 18:30:34 +01:00
Laurent Destailleur
0a2ace81ff Fix phpcs 2021-02-09 18:15:32 +01:00
Laurent Destailleur
1f441deb5d
Merge pull request #16237 from AlexisLaurier/13.0 
13.0 - Fix db begin() not closed into commande.class.php
 2021-02-09 18:06:36 +01:00
Laurent Destailleur
2e6dde6209
Merge pull request #16239 from frederic34/patch-3 
remove debug in V13
 2021-02-09 18:05:54 +01:00
Laurent Destailleur
4f07de5b9c Fix when no contact set 2021-02-09 18:04:46 +01:00
Laurent Destailleur
21558dd0a6 Debug and enhance the feature to assign tasks on project assignation 2021-02-09 17:52:33 +01:00
Frédéric FRANCE
07668167f6
Update card.php 2021-02-09 15:18:07 +01:00
Frédéric FRANCE
8d13e9231f
remove debug 2021-02-09 15:05:32 +01:00
LAURIER Alexis
abf2875eba
commande.class.php - move db->begin() into cloture 
A DB begin request was sent before executing the status guard. If the guard fails, we exited the method without closing it. And it will occur a bug to any further database operation.
 2021-02-09 14:25:45 +01:00
Laurent Destailleur
67fe91f6aa Prepare 13.0.1 2021-02-09 14:15:21 +01:00
Laurent Destailleur
1b129831a9 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-02-09 14:09:46 +01:00
Laurent Destailleur
48a4ed656b Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/comm/propal/class/propal.class.php
	htdocs/expensereport/class/expensereport.class.php
	htdocs/projet/element.php
	htdocs/supplier_proposal/class/supplier_proposal.class.php
 2021-02-09 14:08:49 +01:00
Laurent Destailleur
1c99eaedbc Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-02-09 14:00:11 +01:00
Laurent Destailleur
4a97690f78 Add a check on syntax of hostname for email colector 2021-02-09 13:59:00 +01:00
Laurent Destailleur
3d892bd60b
Merge pull request #15735 from FHenry/dev_new_project_task_add_contact 
NEW: When add contact/user to Project, ask to also affect on Tasks
 2021-02-09 13:43:08 +01:00
Laurent Destailleur
a84bc05f01
Merge pull request #16146 from FHenry/12_fix_pricemin_PRODUIT_CUSTOMER_PRICES 
FIX: manage price min for PRODUIT_CUSTOMER_PRICES
 2021-02-09 13:39:25 +01:00
Laurent Destailleur
71f64c285f
Merge pull request #16171 from OPEN-DSI/new-ficheinter-create-from-origin-choose-lines 
NEW choose lines while creating intervention card from origin
 2021-02-09 13:38:48 +01:00
Laurent Destailleur
e62adb3869
Merge pull request #16224 from FHenry/dev_fix_continue 
Dev fix continue
 2021-02-09 13:32:44 +01:00
Laurent Destailleur
4d4a92b567
Merge pull request #16226 from frederic34/patch-2 
remove deprecated
 2021-02-09 13:31:36 +01:00
Laurent Destailleur
89bda722bf
Merge pull request #16232 from frederic34/paymentvat 
use camelCaps name
 2021-02-09 13:29:40 +01:00
Frédéric FRANCE
e2d2048522
deprecate non camelCaps functions 2021-02-09 13:25:55 +01:00
Laurent Destailleur
5e9065390a
Merge pull request #16228 from FHenry/dev_new_autoload_product_extrafield_line_createtpl 
NEW:add hidden option to auto load input line extrafield into new lines
 2021-02-09 13:24:53 +01:00
Laurent Destailleur
3b0268424b
Merge pull request #16227 from grandoc/new_branch_08_02_2021 
Save the name of generated file as the main doc when generating a doc…
 2021-02-09 13:24:02 +01:00
Laurent Destailleur
a5386246cd
Merge pull request #16225 from frederic34/facturerec 
clean deprecated modelpdf to model_pdf
 2021-02-09 13:23:25 +01:00
Laurent Destailleur
1efee54541
Merge pull request #16230 from FHenry/12_fix_error_assignement 
12 fix error assignement
 2021-02-09 13:22:57 +01:00
Laurent Destailleur
842e112c5b
Merge pull request #16229 from frederic34/patch-3 
doxygen
 2021-02-09 13:22:15 +01:00
Laurent Destailleur
d33de3ebc1
Merge pull request #16234 from davidNDU/clone/develop 
Module builder: Don't delete hidden .tx-folder
 2021-02-09 13:21:55 +01:00
Frédéric FRANCE
04c25a01af
deprecate non camelCaps functions 2021-02-09 13:10:11 +01:00
David Bensel
a0bbe210a3 Module builder: Don't delete hidden .tx-folder 2021-02-09 14:45:06 +03:00
Frédéric FRANCE
f394e55ade
deprecate non camelCaps functions 2021-02-09 10:26:17 +01:00
Frédéric FRANCE
0da942210f
deprecate non camelCaps functions 2021-02-09 09:55:48 +01:00
Frédéric FRANCE
fe9ee5a398
deprecate non camelCaps functions 2021-02-09 09:49:37 +01:00