Commit Graph

81068 Commits

Author SHA1 Message Date
Laurent Destailleur
d502125975 css 2020-11-24 14:32:19 +01:00
Laurent Destailleur
551f82ef6a Fix label 2020-11-24 14:15:43 +01:00
Laurent Destailleur
cf82581a2a Move module to experimental 2020-11-24 14:06:02 +01:00
Laurent Destailleur
e35c745838 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/product/list.php
2020-11-24 13:41:46 +01:00
Laurent Destailleur
faa33f2d3c FIX #15501 2020-11-24 12:52:39 +01:00
Laurent Destailleur
47ca74965b Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-11-24 12:26:50 +01:00
Laurent Destailleur
d2f8b65dbf Prepare use of session in db 2020-11-24 12:26:32 +01:00
Laurent Destailleur
817de18a5d Fix remove log 2020-11-24 12:25:32 +01:00
ptibogxiv
51eed3efe5
Fix api contact 2020-11-24 12:03:31 +01:00
Laurent Destailleur
47cfdb4ef2 Prepare database to be ready for a future fix on sessions 2020-11-24 11:38:05 +01:00
Laurent Destailleur
81566289cd Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/comm/propal/class/propal.class.php
	htdocs/commande/class/commande.class.php
2020-11-24 11:07:35 +01:00
Laurent Destailleur
14ea3a1697 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2020-11-24 10:56:43 +01:00
Laurent Destailleur
53208e620e Use of . as thousand separator. Can use it for decimal if not 3 digits. 2020-11-24 10:56:05 +01:00
Laurent Destailleur
53cf513173
Merge pull request #15180 from aspangaro/14a1
NEW: Accountancy - Add export for Gestinum (v3 & v5)
2020-11-24 09:10:59 +01:00
Laurent Destailleur
df09fc0d0c
Merge pull request #15482 from ptibogxiv/patch-392
Fix contact API
2020-11-24 09:08:10 +01:00
stickler-ci
11704ea6fb Fixing style errors. 2020-11-23 22:33:45 +00:00
ptibogxiv
0d50402803
Update api_contacts.class.php 2020-11-23 23:31:46 +01:00
stickler-ci
c1ba61e548 Fixing style errors. 2020-11-23 21:55:36 +00:00
ptibogxiv
f227d5e72a
Update api_contacts.class.php 2020-11-23 22:53:56 +01:00
Laurent Destailleur
daf26f46a8
Merge pull request #15462 from dolibit-ut/patch-40
Update index.php
2020-11-23 22:22:01 +01:00
Laurent Destailleur
5fb3564bc0
Merge pull request #15467 from hregis/develop_bug2
FIX missing "enabled" value of extrafield after update
2020-11-23 22:18:02 +01:00
Laurent Destailleur
57f1ff7ee2 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-11-23 22:16:47 +01:00
Laurent Destailleur
941bf26be1
Merge pull request #15488 from aspangaro/14a5
NEW: Accountancy - Add hooks 'addMoreActionsButtons' on ledger and jo…
2020-11-23 22:16:11 +01:00
Laurent Destailleur
d7d16833e1
Merge pull request #15494 from andreubisquerra/develop
NEW TakePOS occupied tables visualitzation
2020-11-23 22:14:59 +01:00
Laurent Destailleur
f046673d80
Merge pull request #15485 from frederic34/patch-8
The variable does not seem to be defined for all execution path
2020-11-23 22:07:49 +01:00
Laurent Destailleur
4ca71764c4 FIX #15479 2020-11-23 22:04:21 +01:00
Laurent Destailleur
ccd7ff9a01 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-11-23 21:56:48 +01:00
Laurent Destailleur
9fbbd18254
Merge pull request #15487 from frederic34/patch-14
remove header() no more needed
2020-11-23 21:55:53 +01:00
Laurent Destailleur
bc1d286673
Merge pull request #15495 from Givriz/dev
Feature : creation of a "button-cancel" class
2020-11-23 21:53:45 +01:00
Laurent Destailleur
fabed34a99 FIX #15481 2020-11-23 21:47:51 +01:00
Laurent Destailleur
890f7a0602
Merge pull request #15497 from atm-john/12.0_fix_thirdparty_propagate_extrafields_to
FIX  Dol print error : conf usage thirdparty propagate extrafields to
2020-11-23 21:43:03 +01:00
Laurent Destailleur
39694d3984
Merge pull request #15486 from frederic34/patch-10
remove warnings
2020-11-23 21:42:25 +01:00
Laurent Destailleur
5822fcfbed FIX several warning with the barcode use in ODT templates 2020-11-23 21:38:45 +01:00
Laurent Destailleur
35dbd463e1 CSS 2020-11-23 20:24:11 +01:00
Laurent Destailleur
1e70790cd6 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/product/price.php
2020-11-23 19:55:13 +01:00
Laurent Destailleur
efc539c4b4 Fix css 2020-11-23 19:53:58 +01:00
Laurent Destailleur
9cb5673c36 Fix remove var_dump 2020-11-23 19:46:24 +01:00
Laurent Destailleur
c5278197fb More phpunit test for price2num 2020-11-23 19:45:11 +01:00
Laurent Destailleur
e7dbc8407f FIX formating of prices with foreign languages 2020-11-23 19:08:26 +01:00
ATM john
fbc911aea1 Fix conf usage thirdparty propagate extrafields to 2020-11-23 16:40:31 +01:00
Givriz
dca4cf5987 Feature : ajout de la class "button-cancel"
Ajout de la class "button-cancel" suite à l'issue #3756 et achèvement de ma tâche Dolibarr.
2020-11-23 15:12:52 +01:00
Laurent Destailleur
d2d202dfc7 Fix ProfID5 must be EORI for ES too 2020-11-23 13:22:17 +01:00
andreubisquerra
8aa2ca3489
NEW TakePOS occupied tables visualitzation 2020-11-23 12:51:19 +01:00
Laurent Destailleur
2f6f242d99 CSS 2020-11-23 12:29:38 +01:00
Laurent Destailleur
7d1b84d482 Fix warning 2020-11-22 22:58:14 +01:00
Alexandre SPANGARO
248e49ccd1 NEW: Accountancy - Add hooks 'addMoreActionsButtons' on ledger and journal 2020-11-22 22:19:36 +01:00
Frédéric FRANCE
02e36c7694
Update card.php 2020-11-22 21:16:02 +01:00
Frédéric FRANCE
432adaa47f
Update don.class.php 2020-11-22 21:13:11 +01:00
Frédéric FRANCE
2b93f114cd
remove warnings 2020-11-22 20:59:34 +01:00
Frédéric FRANCE
b3350e033a
The variable does not seem to be defined for all execution path 2020-11-22 20:36:05 +01:00
ptibogxiv
28e4be3b0e
Fix contact API
Get roles by API (without GET this data, we can't add this to POST, so data was deleted 👎 )
2020-11-22 16:25:38 +01:00
Laurent Destailleur
af2eabb24d Fix warning 2020-11-22 15:06:53 +01:00
Laurent Destailleur
9b4b11b4bd Fix var not defined 2020-11-22 14:49:30 +01:00
Laurent Destailleur
f6d6efa288 CSS 2020-11-22 13:23:56 +01:00
Laurent Destailleur
1fc0121552 css 2020-11-22 13:12:41 +01:00
Laurent Destailleur
edb462cca2 Trans 2020-11-22 12:32:08 +01:00
Laurent Destailleur
f2cd2570b9 Fix link 2020-11-22 12:03:44 +01:00
Laurent Destailleur
3d2da45f84 Remove warning 2020-11-22 11:36:07 +01:00
Regis Houssin
fe5dfab4be Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop_bug2 2020-11-22 09:16:33 +01:00
Laurent Destailleur
fe0764be6e Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/comm/action/class/actioncomm.class.php
	htdocs/expedition/class/expedition.class.php
	htdocs/product/class/product.class.php
2020-11-22 02:32:47 +01:00
Laurent Destailleur
69750e4cc4 Fix page lost 2020-11-22 02:15:54 +01:00
Laurent Destailleur
986f918436 Fix image edition when gravatar module is on 2020-11-22 01:47:17 +01:00
Laurent Destailleur
a3faa12753 Fix responsive 2020-11-22 01:28:56 +01:00
Laurent Destailleur
e5e320fd90 Fix null 2020-11-22 01:26:58 +01:00
Laurent Destailleur
6ac1f98ed0 Better responsive 2020-11-22 01:16:32 +01:00
Laurent Destailleur
a30e842521 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-11-21 23:48:34 +01:00
Laurent Destailleur
032b53dbb2
Merge pull request #15451 from frederic34/patch-14
remove warnings
2020-11-21 23:44:55 +01:00
Laurent Destailleur
60bfbe2e57
Merge pull request #15448 from Givriz/dev
Feature : creation of a "button-save" class
2020-11-21 23:44:30 +01:00
Laurent Destailleur
782e3b4c23
Merge pull request #15458 from frederic34/patch-23
doxygen
2020-11-21 23:42:56 +01:00
Laurent Destailleur
d017489088
Merge pull request #15468 from OPEN-DSI/fix-order-list-filter-dates-in-pagination
FIX keep dates filters parameters on order list
2020-11-21 23:42:40 +01:00
Laurent Destailleur
f2d9499f44
Merge pull request #15474 from fappels/13_supplier_barcode
Fix PR #15429 supplier barcode
2020-11-21 23:41:46 +01:00
Laurent Destailleur
87f14a9c7a
Merge pull request #15473 from Valcoop/Valcoop-FIX-opensurvey
FIX Bug where amount of voters was always 0
2020-11-21 23:40:52 +01:00
Laurent Destailleur
0329ce4e11
Merge pull request #15471 from andreubisquerra/master
FIX TakePOS order_notes extrafield
2020-11-21 23:38:36 +01:00
Laurent Destailleur
97e36502f0 Fix warning 2020-11-21 23:37:42 +01:00
Laurent Destailleur
73a3a03398 Fix for smartphone 2020-11-21 23:36:20 +01:00
Laurent Destailleur
9004be1df2 Debug feature to send remind by email 2020-11-21 17:42:07 +01:00
Laurent Destailleur
f39ad2359a Debug 2020-11-21 17:01:17 +01:00
Laurent Destailleur
bf94ce6aad Fix warnings 2020-11-21 16:49:54 +01:00
Laurent Destailleur
95b79094df Fix warning.
Module cron is more clear.
2020-11-21 16:27:50 +01:00
Laurent Destailleur
3534555909 Fix setup of scheduled jobs 2020-11-21 14:14:53 +01:00
Laurent Destailleur
a3fc5241e2 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-11-21 12:45:34 +01:00
Laurent Destailleur
ec49eed8b9 Fix css 2020-11-21 12:45:22 +01:00
Francis Appels
89e101e0b6 Fix wrong value for deprecated 2020-11-21 11:38:07 +01:00
Valcoop
84b2d7e974
FIX Bug where amount of voters was always 0
FIX Bug where amount of voters was always 0. Due to erroneous sql query build fetching the wrong column name.
2020-11-20 22:19:17 +01:00
Florian Mortgat
6c75997b27 FIX wrong tab 2020-11-20 19:15:15 +01:00
Florian Mortgat
f7228d96af FIX 12.0 - when the cronjob 'params' field is empty, the cron method is called with one empty string param instead of no params at all 2020-11-20 19:12:59 +01:00
andreubisquerra
d24ac5109d FIX TakePOS order_notes extrafield 2020-11-20 18:40:04 +01:00
Francis Appels
064b5acff5 List supplier barcode 2020-11-20 17:16:49 +01:00
lvessiller
e87bdd02bd FIX date order param not empty 2020-11-20 16:10:11 +01:00
lvessiller
4fef8d80a5 FIX keep dates filters parameters on order list 2020-11-20 16:01:51 +01:00
Regis Houssin
bd8faae9c1 FIX missing "enabled" value of extrafield after update 2020-11-20 15:59:50 +01:00
Damien BENOIT
ebd64d5e57
Merge pull request #5 from Dolibarr/develop
Update fork
2020-11-20 13:53:43 +01:00
Laurent Destailleur
6976471988
Merge pull request #15442 from hregis/develop_bug2
FIX to preserve order of multiprices fields
2020-11-20 13:38:19 +01:00
Laurent Destailleur
07c192efb8
Merge pull request #15457 from frederic34/patch-22
Update ldap.class.php
2020-11-20 13:37:24 +01:00
Laurent Destailleur
d9354ef5ed
Merge pull request #15456 from frederic34/patch-21
Update rssparser.class.php
2020-11-20 13:37:01 +01:00
Laurent Destailleur
35889fee90
Merge pull request #15455 from frederic34/patch-20
doxygen
2020-11-20 13:36:26 +01:00
Laurent Destailleur
6edabb6675
Merge pull request #15454 from frederic34/patch-19
remove deprecated
2020-11-20 13:36:08 +01:00
Laurent Destailleur
2368b5199d
Merge pull request #15453 from frederic34/patch-18
add filters
2020-11-20 13:35:49 +01:00
Laurent Destailleur
1c4cd04f4e
Merge pull request #15452 from frederic34/patch-15
remove warnings
2020-11-20 13:35:19 +01:00
Laurent Destailleur
09cb472121
Update card.php 2020-11-20 13:34:40 +01:00
Laurent Destailleur
e6878c23a6
Merge pull request #15450 from frederic34/patch-10
remove warnings
2020-11-20 13:33:49 +01:00
UT from dolibit
67a94af84a
Update index.php 2020-11-20 11:53:16 +01:00
Regis Houssin
265d19f563 FIX better method to preserve order 2020-11-20 08:07:44 +01:00
Frédéric FRANCE
b4a5134a7f
doxygen 2020-11-19 22:25:02 +01:00
Frédéric FRANCE
5d4d7c99d6
Update ldap.class.php
The variable $result seems to be never defined.
2020-11-19 22:07:32 +01:00
Frédéric FRANCE
efa5c89c45
Update rssparser.class.php
The variable $**** does not seem to be defined for all execution paths leading up to this point.
2020-11-19 22:03:13 +01:00
Frédéric FRANCE
81eb4b2222
doxygen 2020-11-19 21:44:11 +01:00
Frédéric FRANCE
cac91211c9
remove deprecated 2020-11-19 21:27:20 +01:00
Frédéric FRANCE
19a64a8350
add filters 2020-11-19 21:19:54 +01:00
Frédéric FRANCE
bf535c0dec
remove warnings 2020-11-19 21:12:16 +01:00
Frédéric FRANCE
29dae5d9f0
remove warnings 2020-11-19 21:09:29 +01:00
Frédéric FRANCE
3056197848
remove warnings 2020-11-19 20:57:26 +01:00
Frédéric FRANCE
65e14617a0
doxygen 2020-11-19 20:50:58 +01:00
Givriz
c48129e279 Ajout de la class "button-save"
Ajout de cette class sur les boutons pour pour cloturer une issue ouverte (feature)
2020-11-19 20:23:38 +01:00
Laurent Destailleur
772d401a64 FIX Restore a more common behavior. Add a hidden constant to switch to a
mode when we must enabled load of shippable status.
2020-11-19 19:56:00 +01:00
Laurent Destailleur
06545e005b Use status constant 2020-11-19 18:55:37 +01:00
Laurent Destailleur
9ef395a183
Merge pull request #15444 from OPEN-DSI/new-order-list-hide-shippable-icon-by-default
NEW Add an option to hide by default icon shippable order in order list
2020-11-19 18:53:13 +01:00
Laurent Destailleur
d41018cfcb
Merge pull request #15447 from FHenry/develop
Fix php warning
2020-11-19 18:31:37 +01:00
Laurent Destailleur
aa7383f3d4 Fix warning 2020-11-19 18:15:40 +01:00
Florian HENRY
8b2ec747d4 fix warning 2020-11-19 17:59:03 +01:00
Laurent Destailleur
131c4f8ca8 Fix trans 2020-11-19 15:00:14 +01:00
Laurent Destailleur
939dfc7ead Add a test to avoid translation "=-" 2020-11-19 14:57:36 +01:00
Laurent Destailleur
caf77355ae Introduce EORI number 2020-11-19 14:38:11 +01:00
lvessiller
7e207e80ae FIX spaces before IF 2020-11-19 14:29:37 +01:00
Regis Houssin
524aa96880 FIX to preserve order of multiprices fields 2020-11-19 14:14:43 +01:00
lvessiller
73dab143a3 NEW Add an option to hide by default icon shippable order in command list 2020-11-19 14:14:24 +01:00
Laurent Destailleur
b9f072498c Fix lang 2020-11-19 11:58:55 +01:00
Laurent Destailleur
0760a268f6 Fix warning 2020-11-18 22:25:03 +01:00
Laurent Destailleur
7195760ade Restore lost param 2020-11-18 18:20:40 +01:00
Laurent Destailleur
1708874306
Merge branch 'develop' into develop 2020-11-18 18:16:29 +01:00
Laurent Destailleur
450861df7a Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-11-18 18:13:18 +01:00
Laurent Destailleur
6944e13b58 Fix % in lang file 2020-11-18 18:11:52 +01:00
Laurent Destailleur
ad159013e4
Merge pull request #15433 from OPEN-DSI/new-takepos-invoice-valid-sale-without-lines
NEW log sale without lines as error in cash desk
2020-11-18 18:09:10 +01:00
Laurent Destailleur
1dd697767e
Merge branch 'develop' into 13_doc 2020-11-18 18:08:14 +01:00
Laurent Destailleur
83eaf16a22 Fix css 2020-11-18 16:23:08 +01:00
Laurent Destailleur
348185ff15 Fix js error 2020-11-18 16:04:05 +01:00
Laurent Destailleur
32ae1bf350 Sync transifex 2020-11-18 15:56:06 +01:00
Francis Appels
aade8e7adb Add deprecated fourn_barcode incase already used external. 2020-11-18 14:58:04 +01:00
lvessiller
8de5925f8b FIX remove LOG_ERR in syslog 2020-11-18 14:32:11 +01:00
Francis Appels
22985e7b61 Revert "use barcode iso supplier_barcode"
This reverts commit 57705e225b.
2020-11-18 14:27:29 +01:00
Laurent Destailleur
081474b65d Trans 2020-11-18 14:24:24 +01:00
Laurent Destailleur
cfee518338 Fix trans 2020-11-18 14:03:44 +01:00
Laurent Destailleur
2cbb1c09d5 Add missing token 2020-11-18 13:18:47 +01:00
Laurent Destailleur
c5929a62b7 Fix token 2020-11-18 13:17:53 +01:00
Laurent Destailleur
e78b9a421d Fix sql 2020-11-18 13:14:29 +01:00
Laurent Destailleur
0dbacab68f Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-11-18 13:12:12 +01:00
Laurent Destailleur
17f35e16b9
Merge pull request #15436 from OPEN-DSI/add_extended_infos_on_select_contacts
NEW: Add new option for displaying Contact email (or phones if not defined) and town info list (select list or combobox)
2020-11-18 13:12:03 +01:00
Laurent Destailleur
8d8f0026c2 Fix switch date to datetime 2020-11-18 13:06:30 +01:00
Laurent Destailleur
6150d3bb2c
Merge pull request #15430 from fappels/13_fix_supplier_barcode
Improve doc for customer order delivery date
2020-11-18 12:54:34 +01:00
Laurent Destailleur
823e399d8d
Merge pull request #15428 from atm-quentin/FIX/actioncomm_desc_cant_be_empty
FIX cant empty action comm desc
2020-11-18 12:47:37 +01:00