lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
93,880 Commits 43 Branches 150 Tags 886 MiB
fd888be5e5
Commit Graph

93880 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
lmarcouiller
fd888be5e5 Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop#1 2021-01-19 09:05:08 +01:00
Laurent Destailleur
ca7b644072
Merge pull request #16007 from dolibit-ut/patch-65 
Update dolibarr
 2021-01-18 19:19:46 +01:00
Laurent Destailleur
0a422f44dc
Merge pull request #16011 from Hystepik/develop#3 
Fix #16010 update fournisseur.product.class.php
 2021-01-18 19:16:41 +01:00
Laurent Destailleur
a7dc9c6585
Merge pull request #16014 from davidNDU/develop 
# Fix: type 'sellist' not handled properly in showInputField and showOutputField
 2021-01-18 19:12:55 +01:00
Laurent Destailleur
f76df625a9
Merge pull request #16009 from dolibit-ut/patch-67 
Update Links on GPL.txt
 2021-01-18 18:44:16 +01:00
Laurent Destailleur
5772d0e425
Merge pull request #16008 from dolibit-ut/patch-66 
Update barcode_EAN13.txt
 2021-01-18 18:43:59 +01:00
lmarcouiller
494bb3ee5c Fix #16010 update fournisseur.product.class.php 2021-01-18 16:39:36 +01:00
UT from dolibit
337c3730df
Update Links on GPL.txt 
add  [EN] https://www.gnu.org/licenses/quick-guide-gplv3.en.html
 2021-01-18 16:19:50 +01:00
UT from dolibit
ca7c535980
Update barcode_EAN13.txt 2021-01-18 16:11:43 +01:00
UT from dolibit
5f15c339c7
Update dolibarr 
/var/run/php/php7.0-fpm.sock
 2021-01-18 16:03:27 +01:00
David Bensel
85d63891d9 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop 2021-01-18 17:33:22 +03:00
David Bensel
b777a0660c FIX: type 'sellist' not handled properly in showInputField and showOutputField 2021-01-18 17:31:49 +03:00
Laurent Destailleur
f95bf56c15 Fix translation 2021-01-18 15:24:50 +01:00
Laurent Destailleur
3ff720f8d0
Merge pull request #15999 from frederic34/boxdolibarrstat 
fix unknown variable
 2021-01-18 15:18:07 +01:00
Laurent Destailleur
38f353c047
Merge pull request #16000 from frederic34/patch-1 
fix variable declaration
 2021-01-18 15:16:49 +01:00
Laurent Destailleur
6ff99af8e4
Merge pull request #16005 from dolibit-ut/patch-64 
Update robots.txt
 2021-01-18 15:14:40 +01:00
UT from dolibit
09b4d9d20a
Update robots.txt 
add  Allow: /public/members/new.php
 2021-01-18 14:45:32 +01:00
lmarcouiller
383281e5f3 New update of funnel of prospection 2021-01-18 11:32:02 +01:00
Laurent Destailleur
d5fd07e478 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-01-18 11:07:55 +01:00
Laurent Destailleur
250b530b29 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/class/html.form.class.php
	htdocs/filefunc.inc.php
 2021-01-18 11:07:46 +01:00
Laurent Destailleur
c69631d646 Fix css for multiselect component that are fist hidden 2021-01-18 11:05:02 +01:00
Frédéric FRANCE
171a4e7935
fix variable declaration 
The variable $label seems to be never defined.
The variable $label does not seem to be defined for all execution paths leading up to this point.
 2021-01-18 08:09:12 +01:00
Frédéric FRANCE
83b7e3c678
fix unknown variable 2021-01-18 08:01:18 +01:00
Frederick Jost Zweig
267caf7ac8 Added 'US-BASE' and 'CA-ENG-BASE' to models list 
Added 'US-BASE' and 'CA-ENG-BASE' chart of accounts names to the 'Chart of accounts models' list.
 2021-01-18 02:22:23 +01:00
Frederick Jost Zweig
ed796cd500 Removed 'pcg_subtype' column 
The 'pcg_subtype' column of the table 'llx_accounting_account' has been removed in recent Dolibarr versions, so it has to be removed in this file also. Otherwise, the US chart of account can't be enabled.
 2021-01-18 02:22:16 +01:00
Laurent Destailleur
c248bd0e9e
Merge pull request #15998 from Fred-Zweig/develop 
Fix the 'US-BASE' and 'CA-ENG-BASE' chart of accounts
 2021-01-18 02:21:44 +01:00
Frederick Jost Zweig
5466bcc512
Added 'US-BASE' and 'CA-ENG-BASE' to models list 
Added 'US-BASE' and 'CA-ENG-BASE' chart of accounts names to the 'Chart of accounts models' list.
 2021-01-17 22:46:23 +02:00
Frederick Jost Zweig
6c5c0dfc18
Removed 'pcg_subtype' column 
The 'pcg_subtype' column of the table 'llx_accounting_account' has been removed in recent Dolibarr versions, so it has to be removed in this file also. Otherwise, the US chart of account can't be enabled.
 2021-01-17 22:33:47 +02:00
Laurent Destailleur
350d4638da Prepare v13 2021-01-17 18:50:50 +01:00
Laurent Destailleur
62300689f8 Fix look and feel v13 2021-01-17 15:59:04 +01:00
Laurent Destailleur
2859070c5c Fix filet on extrafields date 2021-01-17 15:47:43 +01:00
Laurent Destailleur
69e0973c72 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-01-17 12:50:12 +01:00
Laurent Destailleur
47b90ab400 Fix duplicate log 2021-01-17 12:49:37 +01:00
Laurent Destailleur
cdab7041c4 Fix duplicate log 2021-01-17 12:49:01 +01:00
Laurent Destailleur
3cec156158 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-01-17 12:22:10 +01:00
Laurent Destailleur
e3335b5b2c Fix bad class 2021-01-17 12:21:27 +01:00
Laurent Destailleur
05f0576b24 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-01-17 12:18:11 +01:00
Laurent Destailleur
d16e221087 Fix popup 2021-01-17 12:16:56 +01:00
Laurent Destailleur
e7a77525ca Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-01-17 12:02:42 +01:00
Laurent Destailleur
10ee98c452 Fix tooltip 2021-01-17 12:02:15 +01:00
Laurent Destailleur
1fe6eccb1c css 2021-01-17 11:46:41 +01:00
Laurent Destailleur
4d42fa2a37 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/class/html.formaccounting.class.php
 2021-01-17 11:34:19 +01:00
Laurent Destailleur
314cc45c81 Fix message 2021-01-17 11:24:24 +01:00
Laurent Destailleur
ee4084ef1b Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/product/card.php
 2021-01-16 19:09:46 +01:00
Laurent Destailleur
a4109d3fd0
Merge pull request #15600 from Hystepik/develop#2 
Close #15384 : New widget stat database
 2021-01-16 18:42:50 +01:00
Laurent Destailleur
440f923b01
Merge pull request #15983 from zuiko/patch-2 
Fix #15820 Bug: Unable to edit the pricing in Sales Order
 2021-01-16 18:34:41 +01:00
Laurent Destailleur
8b9287055e
Update functions.lib.php 2021-01-16 18:34:25 +01:00
Laurent Destailleur
b4be544350
Merge pull request #15978 from bb2a/tel_on_list_users 
NEW Add column "Office phone" and  "User mobile" in user list
 2021-01-16 18:06:19 +01:00
Laurent Destailleur
506d809712 FIX #15991 2021-01-16 17:50:02 +01:00
Laurent Destailleur
87d16c56e7
Merge pull request #15977 from frederic34/TotalAmountOfdirectDebitOrderDiffersFromSumOfLines 
add missing translation
 2021-01-16 17:28:20 +01:00