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

82696 Commits

Author SHA1 Message Date
Florian HENRY
34b792e9a2 betterfix 2021-01-12 21:44:18 +01:00
Laurent Destailleur
eb2faed656 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 2021-01-12 21:06:20 +01:00
Laurent Destailleur
958b255822 Fix #15949 by introducing 'alphawithlgt' as GETPOST possible param. 2021-01-12 21:06:02 +01:00
Laurent Destailleur
a72b33367a
Merge pull request #15957 from aspangaro/13b8 
FIX: Accountancy - Piece is a required field for FEC compatibility
 2021-01-12 20:57:20 +01:00
Laurent Destailleur
942016d0cd
Merge pull request #15956 from aspangaro/13b7 
FIX : Accountancy - FEC Export - Add trans & unaccent on journal label
 2021-01-12 20:56:11 +01:00
Florian HENRY
f30b303269 Merge branch '12.0' into 13.0 2021-01-12 17:45:54 +01:00
Florian HENRY
5b21702508 extrafeild selllist can be use with string fk 2021-01-12 17:44:22 +01:00
Florian HENRY
b1a78c6c18 fix thirdparty list filter type_ent empty 2021-01-12 17:18:41 +01:00
Laurent Destailleur
2e9f3b803d Add some hooks to add new buttons (compensation of removal of tabs). 
Signed-off-by: Laurent Destailleur <eldy@destailleur.fr>
 2021-01-12 13:59:20 +01:00
Laurent Destailleur
75323859e4 Add some hooks to add new buttons (compensation of removal of tabs). 2021-01-12 13:58:16 +01:00
Laurent Destailleur
3906acc951 Must use the generic version 2021-01-12 10:00:05 +01:00
Alexandre SPANGARO
19ac498f4e FIX: Accountancy - Piece is a required field for FEC compatibility 2021-01-12 06:03:57 +01:00
Alexandre SPANGARO
5d6ca5c636 FIX: Accountancy - Add translation when journal label data is record 2021-01-12 05:52:47 +01:00
Alexandre SPANGARO
20fba8f4d2 FIX : Accountancy - FEC Export - Add trans & unaccent on journal label 2021-01-12 05:46:24 +01:00
Laurent Destailleur
db69707579 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 2021-01-11 20:53:31 +01:00
Laurent Destailleur
6e860efa44 CSS 2021-01-11 20:53:18 +01:00
Florian HENRY
33d7998a96 fix: date auto fill date paiement tax 2021-01-11 19:47:20 +01:00
Florian HENRY
e5ef455628 fix: date auto fill date paiement tax 2021-01-11 19:46:08 +01:00
Florian HENRY
77f213832e fix: update group name 2021-01-11 19:40:44 +01:00
atm-lena
f17474a8de 12.0 FIX Translation Permission777 FR 2021-01-11 16:56:19 +01:00
Laurent Destailleur
88fdf0491f
Merge pull request #15943 from aspangaro/13b6 
FIX: Hidden accountancy export button without any right
 2021-01-11 16:07:55 +01:00
Laurent Destailleur
f6de607889 Fix warning 2021-01-11 16:07:02 +01:00
Laurent Destailleur
507bb5b0d9
Merge pull request #15928 from fappels/13_fix_edit_expedition_field 
Fix expedition class (tms cannot be null)
 2021-01-11 16:01:19 +01:00
Laurent Destailleur
1b017a29ff
Merge pull request #15929 from indelog/13.0 
Fix Debugbarr : TraceableDB::idate not compatible with DolDB::idate
 2021-01-11 15:59:54 +01:00
Laurent Destailleur
d2c0dd35b0
Merge pull request #15937 from aspangaro/13b5 
Various payment - Add Amount & direction in clone mode
 2021-01-11 15:58:42 +01:00
Laurent Destailleur
d2c86578fa
Update card.php 2021-01-11 15:58:20 +01:00
Laurent Destailleur
d859072202 Fix GETPOST 2021-01-11 15:19:47 +01:00
Laurent Destailleur
25a703526e Fix GETPOST 2021-01-11 15:16:01 +01:00
Laurent Destailleur
f9f84f84ba Fix rounding of foreign amount 2021-01-11 13:46:23 +01:00
Laurent Destailleur
3a2230e41d Fix rounding 2021-01-11 13:43:33 +01:00
Laurent Destailleur
8debb58f7c Fix rounding of currency unit prices 2021-01-11 13:36:53 +01:00
Laurent Destailleur
16253a79ee FIX GETPOST of qty with wrong parameters 
Conflicts:
	htdocs/bom/bom_card.php
 2021-01-11 13:11:40 +01:00
Laurent Destailleur
445a751d6b Fix price2num 2021-01-11 13:08:02 +01:00
Laurent Destailleur
c10072ccef Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 2021-01-11 13:07:31 +01:00
Laurent Destailleur
788ef257a9 Fix GETPOST for qty 2021-01-11 13:02:05 +01:00
Laurent Destailleur
fe7be8362f Fix td balance 2021-01-11 12:03:28 +01:00
stickler-ci
7339217cf1 Fixing style errors. 2021-01-11 08:51:52 +00:00
Alexandre SPANGARO
c40976e4f9 FIX: Hidden accountancy export button without any right 2021-01-11 09:47:59 +01:00
Alexandre SPANGARO
004ee952d9 Various payment - Add Amount & Sens in clone mode 2021-01-10 08:16:19 +01:00
Laurent Destailleur
b3461161ec Add option MAIN_NB_OF_YEAR_IN_WIDGET_GRAPH 2021-01-09 02:28:50 +01:00
Laurent Destailleur
a3fd6f07e9 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2021-01-08 15:10:05 +01:00
Laurent Destailleur
243b227c33 Fix prerequisites 2021-01-08 15:09:49 +01:00
Laurent Destailleur
24c926b32f Update doc 2021-01-08 15:09:16 +01:00
Indelog
843f49643d Fix Debugbarr : TraceableDB::idate not compatible with DolDB::idate 
The `TracableDB` class extend the `DolDB` but not implement the method `idate`
correctly : it missing the `$gm` parameter.
 2021-01-08 12:39:03 +01:00
Laurent Destailleur
69c614ec2a Sync transifex 2021-01-08 11:22:11 +01:00
Francis Appels
d371df66b7 Merge remote-tracking branch 'Dolibarr/13.0' into 13_fix_edit_expedition_field 2021-01-07 18:30:25 +01:00
Francis Appels
afc85c2f2d Fix expedition class 
- update shipment, tms is auto update field
- wrong vars
- clean code
 2021-01-07 18:24:44 +01:00
Laurent Destailleur
2794327e10 Update box_birthdays.php 2021-01-07 12:50:14 +01:00
Lars Wallenborn
1880e51d1c [FIX] sort order in birthday box 
The current sort order is by date and not by day of month. This yields
the following unexpected results:

Given

* Person A, born on 1980-01-10
* Person B, born on 1970-01-30

I expect Person A to be listed first because their birthday is before
that of Person B _in January_. But without this fix, Person B would show
up first because 1970 is before 1980.
 2021-01-07 12:50:07 +01:00
Laurent Destailleur
a498f8dfe1 Fix sort by day 2021-01-07 12:49:54 +01:00
Laurent Destailleur
396cbdb79c
Merge pull request #15863 from aspangaro/13b5 
Accountancy - Add date_export on new ledger & subledger to show edit or delete link when is not export yet
 2021-01-07 11:15:37 +01:00
Laurent Destailleur
8ca639b79f
Merge pull request #15916 from atm-maxime/fix_commonfieldadd_type 
Fix date and datetime type in commonfield_add.tpl
 2021-01-07 10:28:10 +01:00
Laurent Destailleur
3399ab2c5d Fix phpcs 2021-01-07 10:20:41 +01:00
Maxime Kohlhaas
1b7d194e18 Finish fix on add form values 2021-01-07 09:03:25 +01:00
Alexandre SPANGARO
5606542220 FIX: Accountancy - Add control on required fields when we create an account 2021-01-07 06:59:40 +01:00
Alexandre SPANGARO
74ba7e68da Mix two systems for create and edit account from balance 2021-01-07 06:27:36 +01:00
Alexandre SPANGARO
1f87bbbd01 Typo 2021-01-07 06:26:24 +01:00
Alexandre SPANGARO
4077565de9 Merge branch '13.0' into 13b5 2021-01-07 05:27:43 +01:00
Laurent Destailleur
ce035eb4ce Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/bom/bom_card.php
 2021-01-06 21:33:59 +01:00
Laurent Destailleur
1aa7e4adeb Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2021-01-06 21:32:46 +01:00
Laurent Destailleur
0dc182553e
Merge pull request #15896 from atm-lena/FIX/issue_14197 
FIX balance starting and ending fiscal month #14197
 2021-01-06 21:32:02 +01:00
Laurent Destailleur
2a31ca969f FIX #15388 #15891 2021-01-06 21:29:58 +01:00
Laurent Destailleur
8918299364
Update commonfields_add.tpl.php 2021-01-06 21:24:37 +01:00
Maxime Kohlhaas
42e45d4a7a Fix date and datetime type in commonfield_add.tpl 2021-01-06 21:14:40 +01:00
Laurent Destailleur
4c00167687 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/societe/card.php
 2021-01-06 20:51:44 +01:00
Laurent Destailleur
123bd81721 Trim no more required 2021-01-06 20:42:18 +01:00
Laurent Destailleur
ef8021467b FIX #15892 #15017 2021-01-06 20:41:40 +01:00
Laurent Destailleur
93323f6d61
Merge pull request #15889 from atm-quentin/FIX/issue_15516 
FIX wrong name for search status param issue #15516
 2021-01-06 20:35:52 +01:00
Laurent Destailleur
8f1617884a
Merge pull request #15888 from atm-quentin/FIX/issue_15659 
FIX issue 15659 : Missing test if supplier conf is enabled
 2021-01-06 20:35:34 +01:00
Laurent Destailleur
679948e207
Merge pull request #15893 from atm-lena/FIX_issue_15629 
FIX #15629
 2021-01-06 20:34:31 +01:00
Laurent Destailleur
71278b173e Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 2021-01-06 20:28:33 +01:00
Laurent Destailleur
654cf2d990 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 
Conflicts:
	htdocs/core/lib/functions.lib.php
 2021-01-06 20:27:46 +01:00
Laurent Destailleur
9e50a06f2b
Merge pull request #15894 from atm-john/11.0_fix_issue_14833 
Fix #14833 A security mecanism generates data loss
 2021-01-06 20:26:19 +01:00
Laurent Destailleur
a955df21bf
Merge pull request #15905 from atm-quentin/FIX/issue_14501 
FIX useless tracking number displayed on pdf if empty issue #14501
 2021-01-06 20:22:43 +01:00
Laurent Destailleur
2ab74e871e Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 2021-01-06 20:21:40 +01:00
Laurent Destailleur
170814c718 Fix missing rollback 2021-01-06 20:21:22 +01:00
Laurent Destailleur
3d96c5a454 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/admin/dict.php
	htdocs/bom/tpl/objectline_create.tpl.php
	htdocs/bom/tpl/objectline_edit.tpl.php
	htdocs/bom/tpl/objectline_view.tpl.php
	htdocs/core/boxes/box_shipments.php
	htdocs/societe/class/societe.class.php
 2021-01-06 20:20:37 +01:00
Laurent Destailleur
7f21332533 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2021-01-06 20:12:17 +01:00
Laurent Destailleur
17306bc715 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 
Conflicts:
	htdocs/core/boxes/box_shipments.php
 2021-01-06 20:12:09 +01:00
Laurent Destailleur
7372a18283
Update box_shipments.php 2021-01-06 19:56:49 +01:00
Laurent Destailleur
33b138b5ba
Merge pull request #15904 from atm-jpb/12.0_Fix 
Fix add ticket on elementList
 2021-01-06 19:48:10 +01:00
Laurent Destailleur
99066eaf5c
Merge pull request #15912 from atm-jpb/12.0_fix_cat_product_list 
FIX : add categories params  on llxHeader filter
 2021-01-06 19:38:57 +01:00
Laurent Destailleur
4f2c6e2901
Merge pull request #15911 from atm-kevin/Fix_create_contact_from_thirdparty_from_member 
Fix #15829
 2021-01-06 19:33:25 +01:00
Laurent Destailleur
fead1b7e86
Merge pull request #15907 from atm-kevin/Fix_multicurrency_supplier_invoice_puht_devise 
Fix #14353
 2021-01-06 19:32:53 +01:00
jpb
2be2cdaadf fix style errors 2021-01-06 16:06:03 +01:00
ATM john
cf324f75d7 Fix bom line unit display #13831 2021-01-06 16:01:19 +01:00
jpb
99b977a08e add categories params on llxHeader filter 2021-01-06 15:38:30 +01:00
kevin
5164a96aa0 Fix #15829 2021-01-06 15:35:33 +01:00
kevin
e8ba4de832 Fix #14353 2021-01-06 14:46:56 +01:00
Adrien Raze
6f05ba4db9 NEW : Added of doActions hooks in bank/line.php and bank/transfer.php 2021-01-06 14:26:40 +01:00
stickler-ci
ca557cfacd Fixing style errors. 2021-01-06 13:22:35 +00:00
quentin
e44b14364a FIX useless tracking number displayed on pdf if empty 2021-01-06 14:17:06 +01:00
jpb
19ee163f31 Fix add ticket on elementList 2021-01-06 13:54:51 +01:00
ATM john
50b5226d10 FIX #15465 External user sees last 5 shipments to other customers in the dashboard 2021-01-06 12:40:38 +01:00
atm-lena
4b9bb824d0 FIX balance starting and ending fiscal month #14197 2021-01-06 11:16:51 +01:00
ATM john
92a4314779 Fix security mecanism generating data loss 2021-01-06 10:45:54 +01:00
atm-lena
6f15683709 FIX create ticket : thirdparty/contact notification #15629 2021-01-06 10:42:48 +01:00
quentin
2f932330d3 FIX wrong name for search status param 2021-01-06 10:10:39 +01:00
quentin
7161ca9e70 FIX issue 15659 : Missing test if conf is enabled 2021-01-06 09:54:02 +01:00
Laurent Destailleur
01062c5940 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/product/list.php
 2021-01-05 19:12:22 +01:00
Laurent Destailleur
58e33c59f4 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 
Conflicts:
	htdocs/product/list.php
 2021-01-05 19:07:53 +01:00
UT from dolibit
a370ba1bbc Update check.php 
$arrayphpminversionwarning = array(5, 6, 0);
 2021-01-05 18:53:19 +01:00
lvessiller
ca6899c138 FIX right to show VAT rate in product list 2021-01-05 16:11:46 +01:00
Laurent Destailleur
9764f086d3 Fix Field code is mandatory but not field note in tax dictionary 2021-01-05 14:31:14 +01:00
Laurent Destailleur
8dc4e5929c Fix var not defined 2021-01-05 12:43:57 +01:00
Laurent Destailleur
4b45c5e723 Trans 2021-01-05 12:29:13 +01:00
Laurent Destailleur
5e92ed0dcd Fix load lang 2021-01-05 10:44:28 +01:00
Laurent Destailleur
7dd1f28a5c Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 2021-01-05 10:40:10 +01:00
Laurent Destailleur
40645ea24d Fix load lang 2021-01-05 10:39:53 +01:00
Alexandre SPANGARO
9cea8b8244 FIX: Loan - Payment in not integrate in bank due to a problem with the type of payment 2021-01-05 01:56:24 +01:00
Laurent Destailleur
f8fe7b5a0e FIX #15851 2021-01-04 16:38:09 +01:00
Laurent Destailleur
c58451dbb6 Code comment 2021-01-04 16:07:54 +01:00
Laurent Destailleur
e488f94af3 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 2021-01-04 15:39:48 +01:00
Laurent Destailleur
7141fa315e Debug v13 2021-01-04 15:32:18 +01:00
Laurent Destailleur
00cb253873
Merge pull request #15858 from frederic34/patch-10 
syntax error
 2021-01-04 14:07:56 +01:00
Laurent Destailleur
4d09d3a576
Merge pull request #15860 from fappels/13_debug_shipments 
Some debug on Shipments and reception.
 2021-01-04 14:06:52 +01:00
Laurent Destailleur
ef76c067e0 Add limit to 25000 2021-01-04 13:37:21 +01:00
Laurent Destailleur
8df5928e9c Fix selection must depends on enabled modules 2021-01-04 13:32:43 +01:00
Laurent Destailleur
5c104e344c Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/core/lib/admin.lib.php
	htdocs/ticket/list.php
 2021-01-04 12:17:59 +01:00
Laurent Destailleur
71e6d20cb5 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 2021-01-04 12:08:27 +01:00
Laurent Destailleur
66bd040d2c Fix regression 2021-01-04 12:08:14 +01:00
Laurent Destailleur
c866e2c43e
Merge pull request #15869 from aspangaro/13b6 
FIX: Loan - Missing fk_bank when we add payment with schedule & amount insurance / interest is inverted
 2021-01-04 12:03:33 +01:00
Laurent Destailleur
1960c712df
Merge pull request #15866 from atm-maxime/fix_contactelement 
Fix dict contact type element list
 2021-01-04 12:02:57 +01:00
Laurent Destailleur
bb22f2ccaf
Update admin.lib.php 2021-01-04 12:02:41 +01:00
Laurent Destailleur
f829845405
Merge pull request #15861 from atm-maxime/fix_modulebuilder_template_buttons 
Fix use dolGetButton in templates
 2021-01-04 11:58:13 +01:00
stickler-ci
30cd041209 Fixing style errors. 2021-01-04 10:57:18 +00:00
Laurent Destailleur
82395d578b
Update myobject_card.php 2021-01-04 11:56:56 +01:00
Juanjo Menent
d892d8c3c7 FIX: Bad dates filtering in the ticket list causes sql error 2021-01-04 10:59:45 +01:00
Alexandre SPANGARO
8f4fc046ec FIX: Loan - amount insurance / interest is inverted 2021-01-04 06:57:56 +01:00
Alexandre SPANGARO
433ddd61a7 FIX: Loan - Missing fk_bank when we add payment with schedule 2021-01-04 06:57:10 +01:00
Maxime Kohlhaas
e5fbb963a3 Fix picto in template 2021-01-03 22:53:04 +01:00
Maxime Kohlhaas
5792995b1f Fix function call 2021-01-03 22:52:36 +01:00
Laurent Destailleur
b0738643fb FIX Solve problem with TZ 2021-01-03 18:42:45 +01:00
Maxime Kohlhaas
e190b010d3 Fix dict contact type element list 2021-01-03 16:05:04 +01:00
Laurent Destailleur
645b7694c9 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/core/db/DoliDB.class.php
 2021-01-03 15:26:31 +01:00
Laurent Destailleur
8ad5dc81de GETPOST 2021-01-03 15:13:29 +01:00
Laurent Destailleur
f462f68056 Code comment 2021-01-03 15:10:33 +01:00
Alexandre SPANGARO
e18bdfd9f0 Add missing language key 2021-01-03 15:01:15 +01:00
Alexandre SPANGARO
9300951c6e Add language file 2021-01-03 14:54:35 +01:00
Francis Appels
236ff2d4e4 indent 2021-01-03 12:26:10 +01:00
Francis Appels
50d2e2d161 Debug reception contacts and list 2021-01-03 12:21:20 +01:00
Francis Appels
cbf6fe1f62 Clean code 2021-01-03 11:42:11 +01:00
Francis Appels
799927432c regression for user type on shipment contact 2021-01-03 10:53:48 +01:00
Alexandre SPANGARO
691e8580cd Add date_export on new ledger & subledger to show edit or delete link when is not export yet 2021-01-03 05:44:07 +01:00
Alexandre SPANGARO
1d5089e95e Repare link to create unknown account 2021-01-03 04:42:21 +01:00
Alexandre SPANGARO
1ebb018903 Add language file 2021-01-03 04:11:25 +01:00
Maxime Kohlhaas
96411ed491 Fix use dolGetButton in templates 2021-01-02 18:05:18 +01:00
Francis Appels
ade0e008e9 Some debug on Shipments. 
Wrong object status on list paging.
Parameter error on link contact.
nbr Linked files not shown in tab badge.
 2021-01-02 17:42:33 +01:00
Laurent Destailleur
2d1121031a var not defined 2021-01-02 17:04:08 +01:00
Laurent Destailleur
982f8eb95d Fix syntax error 2021-01-02 17:03:26 +01:00
Laurent Destailleur
7b3ed7301d Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/compta/facture/class/facture-rec.class.php
	htdocs/fichinter/class/fichinterrec.class.php
	htdocs/fourn/class/fournisseur.commande.class.php
	htdocs/supplier_proposal/class/supplier_proposal.class.php
 2021-01-02 17:01:03 +01:00
Laurent Destailleur
fd4dab495f FIX Bad cleaning of VAT rate when numbers are into code 2021-01-02 16:51:34 +01:00
Frédéric FRANCE
e4b5ec122e
syntax error 2021-01-02 16:38:19 +01:00
Laurent Destailleur
ce0abd17fe Debug v13 2021-01-02 16:18:16 +01:00
Aisuko
2d22c1d5d1 Fix wrong cast for pos_change 
The variable pos_change was cast in "int" where it should be cast in "float". It results in rounded value making the receipt showing wrong cash exchange.
 2021-01-02 15:59:43 +01:00
Laurent Destailleur
f71c581140
Merge pull request #15856 from aspangaro/13b5 
FIX: Accountancy - Debug experimental function to validate movements & typo
 2021-01-02 15:53:28 +01:00
Laurent Destailleur
02ae06f24a Fix warning 2021-01-02 15:52:12 +01:00
Laurent Destailleur
f16be78167 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/admin/limits.php
	htdocs/takepos/invoice.php
 2021-01-02 15:49:30 +01:00
Laurent Destailleur
d46eb08083 More log and use id to refresh/reload an invoice. 2021-01-02 15:36:19 +01:00
Laurent Destailleur
601d4618d4 Missing vat rates 2021-01-02 14:52:37 +01:00
Laurent Destailleur
a8d15fafd2 Fix missing span 2021-01-02 14:17:54 +01:00
Alexandre SPANGARO
2727fd70b7 FIX: Accountancy - Debug experimental function to validate movements 2021-01-02 14:00:24 +01:00
Laurent Destailleur
791a509c6c Fix warning 2021-01-02 13:26:50 +01:00
Laurent Destailleur
eb3b0ad672 Fix warning 2021-01-02 13:24:06 +01:00
Laurent Destailleur
3cb71ef53e Code comment 2021-01-01 22:55:22 +01:00
Laurent Destailleur
f328bdc3f9 Fix var name 2021-01-01 22:05:12 +01:00
Laurent Destailleur
37e9d13982 Fix warning 2021-01-01 21:25:37 +01:00
Laurent Destailleur
ede38dec30 Fix warning 2021-01-01 21:07:25 +01:00
Alexandre SPANGARO
bf8b1cec3b Merge branch '13.0' into 13b5 2021-01-01 06:17:33 +01:00
Laurent Destailleur
d2345ea96c Fix warning 2020-12-31 16:55:29 +01:00
Laurent Destailleur
d834f6023d Fix rounding 2020-12-31 16:06:54 +01:00
Laurent Destailleur
3743790160 Fix warning 2020-12-31 15:49:25 +01:00
Laurent Destailleur
9e8c6eb0a1 FIX #15849 2020-12-31 15:05:17 +01:00
Alexandre SPANGARO
46160614b8 Typo 2020-12-31 03:30:18 +01:00
Laurent Destailleur
e17d4b8220 Fix total when no data 2020-12-30 23:51:55 +01:00
Laurent Destailleur
1eb8833356 Fix total when no data 2020-12-30 23:39:51 +01:00
Laurent Destailleur
60d1b08f84 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/compta/paiement/class/paiement.class.php
	htdocs/takepos/invoice.php
 2020-12-30 22:58:40 +01:00
Laurent Destailleur
65edc377c3 FIX Visible date of payment 2020-12-30 22:53:21 +01:00
Laurent Destailleur
e4915d9825 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 2020-12-30 22:02:06 +01:00
Laurent Destailleur
40d19e6c36 Fix tooltip on timezone 2020-12-30 22:01:26 +01:00
Laurent Destailleur
ab54d30b57 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/langs/en_US/cashdesk.lang
 2020-12-30 21:48:44 +01:00
Laurent Destailleur
79da047802 FIX Dates of sales start in TakePOS 
Conflicts:
	htdocs/langs/en_US/cashdesk.lang
 2020-12-30 21:46:40 +01:00
Laurent Destailleur
6ef7d3db79 FIX Dates of sales start in TakePOS 2020-12-30 21:43:04 +01:00
Laurent Destailleur
255b943b99 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/takepos/invoice.php
 2020-12-30 21:25:02 +01:00
Laurent Destailleur
1ec763fc14 FIX When creating a new POS sell, the creation date must be modified. 2020-12-30 21:22:54 +01:00
Laurent Destailleur
5a097b21e4 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/compta/bank/various_payment/card.php
 2020-12-30 13:21:33 +01:00
Laurent Destailleur
6a63fea184 FIX #15817 2020-12-30 13:00:10 +01:00
Laurent Destailleur
c6c697cb43
Merge pull request #15835 from aspangaro/12p10 
FIX: #15751 Miscellaneous payment type change to 0 after updating subledger account
 2020-12-30 12:42:57 +01:00
Laurent Destailleur
e34fb394a0 Fix warning 2020-12-30 12:38:45 +01:00
Laurent Destailleur
7e9fcfe664 Fix warning 2020-12-30 12:31:33 +01:00
Laurent Destailleur
87a452c6f4 Fix warning 2020-12-30 12:16:01 +01:00
Laurent Destailleur
057ed201a7 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/accountancy/bookkeeping/balance.php
 2020-12-30 12:08:12 +01:00
Laurent Destailleur
9e04217e35
Merge pull request #15802 from aspangaro/12p9 
FIX: Accountancy - Retire entire opening balance feature
 2020-12-30 11:21:34 +01:00
Alexandre SPANGARO
a336e45098 FIX: #15751 Miscellaneous payment type change to 0 after updating subledger 2020-12-30 08:11:20 +01:00
Alexandre SPANGARO
0e2b7d8b3c Remove typo 2020-12-30 07:23:26 +01:00
Laurent Destailleur
057945f693 Fix bad var 2020-12-29 17:04:39 +01:00
Laurent Destailleur
791cbb29c2 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 2020-12-29 16:55:58 +01:00
Laurent Destailleur
be2e3aa7a9
Merge pull request #15827 from fappels/13_php_warning_add_line 
FIX add line php warning when no customer relative discount history.
 2020-12-29 16:55:33 +01:00
Laurent Destailleur
b066e66c26
Merge pull request #15826 from FHenry/13.0 
fix product/service list right
 2020-12-29 16:54:55 +01:00
Laurent Destailleur
483ea559f5 Fix warning #15823 2020-12-29 16:54:28 +01:00
Frédéric FRANCE
e4c3499cad remove warnings 
Conflicts:
	htdocs/societe/class/societe.class.php
 2020-12-29 16:48:29 +01:00
Laurent Destailleur
620a088827 Fix warning 2020-12-29 16:33:58 +01:00
Francis Appels
4267828ee6 FIX add line php warning when no customer relative discount history. 2020-12-29 14:47:16 +01:00
Laurent Destailleur
ae7d3abdc5 css 2020-12-29 05:00:51 +01:00
Laurent Destailleur
f498657071 Fix warning 2020-12-29 04:44:48 +01:00
Laurent Destailleur
bf0a9fa137 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/societe/class/societe.class.php
 2020-12-29 04:32:13 +01:00
Laurent Destailleur
c3326a0963 FIX Creation of thirdparty when setup is empty 2020-12-29 04:30:37 +01:00
Laurent Destailleur
af41c06822 Fix warnings 2020-12-29 04:27:16 +01:00
Laurent Destailleur
7b93c34c0f Fix phpunits 2020-12-29 03:48:11 +01:00
Laurent Destailleur
e07486b626 Fix columns of download of list of targets of emailing 2020-12-29 02:20:10 +01:00
Laurent Destailleur
d9a2e2e402 Responsive 2020-12-29 02:06:42 +01:00
Florian HENRY
af860a32bc fix product right 2020-12-28 21:19:25 +01:00
Laurent Destailleur
b7cd27e76a Fix warning 2020-12-28 12:42:55 +01:00
Laurent Destailleur
8b696ced3b Clean code 2020-12-28 12:38:33 +01:00
Laurent Destailleur
7c3688c66f Fix var not defined 2020-12-28 12:36:36 +01:00
Laurent Destailleur
4b3cd947f2 Fix name of function 2020-12-28 12:33:00 +01:00
Laurent Destailleur
cec96b33ae Fix warning 2020-12-28 12:30:59 +01:00
Alexandre SPANGARO
49a1268ba1 Merge branch '12.0' into 12p9 2020-12-28 03:12:57 +01:00
Alexandre SPANGARO
26791714ce Fix : Introduce constant ACCOUNTANCY_SHOW_OPENING_BALANCE 2020-12-28 03:07:33 +01:00
Laurent Destailleur
eac711f96c Debug v13 2020-12-27 21:41:39 +01:00
Laurent Destailleur
6421f757dc FIX Can delete a directory created manually that can not be indexed 2020-12-27 21:21:13 +01:00
Laurent Destailleur
d1d4914684 Sanitize data 2020-12-27 20:49:54 +01:00
Laurent Destailleur
e89a410e59 Fix warning 2020-12-27 20:33:07 +01:00
Laurent Destailleur
81ab33ff12 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/accountancy/bookkeeping/balance.php
	htdocs/product/list.php
 2020-12-27 19:40:03 +01:00
Laurent Destailleur
5aae018a0b Fix for php8 2020-12-27 19:33:07 +01:00
Laurent Destailleur
4ec78d029b Fix warning 2020-12-27 19:21:37 +01:00
Laurent Destailleur
5ff53691a5 Fix migration 2020-12-27 19:13:09 +01:00
Laurent Destailleur
00c847b743 Fix warning 2020-12-27 16:56:44 +01:00
Laurent Destailleur
199b46cfaf Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/langs/en_US/modulebuilder.lang
 2020-12-27 16:53:15 +01:00
Laurent Destailleur
5fc3a9ce7d Debug v13 2020-12-27 15:39:10 +01:00
Laurent Destailleur
28642238de Fix error message 2020-12-27 15:09:27 +01:00
Laurent Destailleur
d2af03856c
Merge pull request #15808 from FHenry/12.0 
fix: colspan balance accountanty
 2020-12-27 13:56:07 +01:00
Laurent Destailleur
4b5a42a805
Merge pull request #15816 from atm-maxime/new_modulebuilder_contacttab13 
New modulebuilder contact tab
 2020-12-27 13:17:18 +01:00
Laurent Destailleur
f20f4cc599 Fix warnings 2020-12-26 19:23:25 +01:00
Maxime Kohlhaas
22e0360575 Fix missing delete files in module builder 2020-12-25 11:53:13 +01:00
Maxime Kohlhaas
4cee1e8d79 Fix admin/myobject_extrafields page 2020-12-25 11:53:06 +01:00
Maxime Kohlhaas
214167b552 Add generation of admin/xxx_extrafields page 2020-12-25 11:53:00 +01:00
Maxime Kohlhaas
11146a0b66 Add contact tab in default generated php files 2020-12-25 11:52:34 +01:00
Laurent Destailleur
58cd7c97a5 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/comm/mailing/card.php
	htdocs/comm/mailing/cibles.php
	htdocs/comm/mailing/class/mailing.class.php
 2020-12-24 13:05:17 +01:00
Laurent Destailleur
739695c442 Fix delay to wait between email for emailing refused float. 2020-12-24 12:49:17 +01:00
Laurent Destailleur
360a85cbbc FIX add autofix of count of email target when data is corrupted 2020-12-24 12:32:34 +01:00
Laurent Destailleur
a0440fbe88 Removed warnings 2020-12-24 03:06:52 +01:00
Laurent Destailleur
5ef3ffbdc6 Fix warning 2020-12-24 03:03:38 +01:00
Laurent Destailleur
6c2a17b29a Fix warning 2020-12-24 02:59:00 +01:00
Laurent Destailleur
3586da75a2 Fix warning 2020-12-24 02:52:49 +01:00
Laurent Destailleur
ea0ae758a3 Fix warnings 2020-12-24 02:48:32 +01:00
Laurent Destailleur
11a122176d Clean code 2020-12-24 02:33:11 +01:00
Laurent Destailleur
65dc766765 Code comment 2020-12-24 02:12:13 +01:00
Laurent Destailleur
11b15557eb Clean code 2020-12-24 02:09:11 +01:00
Laurent Destailleur
88e441412c CSS 2020-12-24 01:35:59 +01:00
Florian HENRY
69165f5ae2 Merge branch '12.0' into 13.0 2020-12-24 00:49:27 +01:00
Florian HENRY
c438bf1a12 Merge branch '12.0' of github.com:Dolibarr/dolibarr into 12.0 2020-12-24 00:49:14 +01:00
Florian HENRY
60d8fb4719 fic porject mass action right 2020-12-24 00:48:48 +01:00
Florian HENRY
f8ef2a352f Merge branch '12.0' into 13.0 2020-12-23 23:51:02 +01:00
Florian HENRY
7d1d588225 fix service right problem for mass action 2020-12-23 23:48:45 +01:00
Laurent Destailleur
b66ec5bc64 Fix css 2020-12-23 23:16:27 +01:00
Laurent Destailleur
02daf09928 Fix for php8 2020-12-23 23:06:34 +01:00
Laurent Destailleur
f8e4985de1 Trans 2020-12-23 22:30:29 +01:00
Laurent Destailleur
4471d7d1da FIX debug report expense/income 2020-12-23 22:18:38 +01:00
Laurent Destailleur
d65dc85a10 FIX for php 8 2020-12-23 19:16:25 +01:00
Laurent Destailleur
1c73d38093 Fix api to download for shipments 2020-12-23 19:16:15 +01:00
Laurent Destailleur
93d309cdbc FIX Update Restler API to 3.1.1 to fix error with php8 2020-12-23 19:15:58 +01:00
Laurent Destailleur
9007e7be2a Fix sql for postgresql 2020-12-23 16:13:45 +01:00
Laurent Destailleur
d3f352fe10 Fix log 2020-12-23 15:52:00 +01:00
Laurent Destailleur
70df6130b5 Fix SQL to export categories of contact 
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0

Conflicts:
	htdocs/product/class/product.class.php
 2020-12-23 15:45:33 +01:00
Laurent Destailleur
8658f903fa FIX Must delete extrafields before main table on product deletion. 2020-12-23 15:00:25 +01:00
Laurent Destailleur
bf606ede12 Enhance remote ip detection 2020-12-23 13:27:30 +01:00
Florian HENRY
77c335c5f3 fix colspan balance accountanty 2020-12-23 09:19:56 +01:00
Laurent Destailleur
bac2ae0d5f Fix warnings 2020-12-22 17:33:17 +01:00
Laurent Destailleur
4fcf606d04 Error management on emailcollector edition 2020-12-22 17:22:24 +01:00
Laurent Destailleur
083b6a8c87 Fix emailcollector edition 2020-12-22 17:03:57 +01:00
Laurent Destailleur
6fad9c2d3b Fix edition of operation into email collector 2020-12-22 16:59:59 +01:00
Laurent Destailleur
ef2bd563e2 trans 2020-12-22 16:55:51 +01:00
Laurent Destailleur
0068c1fb78 Trans 2020-12-22 16:29:53 +01:00
Alexandre SPANGARO
f273273129 FIX: Accountancy - Retire entire opening balance feature 2020-12-22 06:57:55 +01:00
Laurent Destailleur
ea745c89c7
Merge pull request #15801 from ptibogxiv/patch-403 
Fix edit variant v13+
 2020-12-21 19:30:32 +01:00
Laurent Destailleur
58b4de8bc3 More complete fix for #15712 2020-12-21 19:27:42 +01:00
stickler-ci
0e629204f2 Fixing style errors. 2020-12-21 17:49:49 +00:00
ptibogxiv
196fb07830
Fix edit variant v13+ 
after add, edit have same mistakes
 2020-12-21 18:47:43 +01:00
Laurent Destailleur
9efc70b284 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 2020-12-21 18:42:27 +01:00
Laurent Destailleur
cfbf59ff43
Merge pull request #15788 from andreubisquerra/master 
FIX Open Drawer with new TakePOS connector
 2020-12-21 18:34:59 +01:00
Laurent Destailleur
15c0773de7
Merge pull request #15791 from frederic34/patch-8 
Remove no more needed file
 2020-12-21 18:21:51 +01:00
Laurent Destailleur
e2c192813e Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 2020-12-21 18:21:36 +01:00
Laurent Destailleur
5252aa42b2 Trans 2020-12-21 18:20:13 +01:00
Laurent Destailleur
a04ee0897d
Merge pull request #15789 from frederic34/api_setup 
fix unknown variable
 2020-12-21 18:16:56 +01:00
Laurent Destailleur
48ce5c5499
Update api_setup.class.php 2020-12-21 18:16:16 +01:00
Laurent Destailleur
04d249cef0
Merge pull request #15792 from frederic34/notifications 
simplify notications class
 2020-12-21 18:14:04 +01:00
Laurent Destailleur
373ef45af5
Merge pull request #15793 from fappels/13_fix-reception_movement_list 
FIX missing reception link in stock movement list.
 2020-12-21 18:10:21 +01:00
Laurent Destailleur
88837df442
Merge pull request #15790 from frederic34/fixphpcs_2020_12 
fix phpcs
 2020-12-21 18:10:01 +01:00
Laurent Destailleur
6d1799eb25
Merge branch 'develop' into fixphpcs_2020_12 2020-12-21 18:08:20 +01:00
Laurent Destailleur
afc3528376
Merge pull request #15796 from ptibogxiv/patch-400 
FIX:  variants v13+
 2020-12-21 18:07:00 +01:00
Laurent Destailleur
48dfc90c8b
Update create.php 2020-12-21 18:06:02 +01:00
Laurent Destailleur
189c0be00b
Merge pull request #15797 from FHenry/dev_fix_reslter_explorer_api_thirdparty 
Dev fix reslter explorer api thirdparty
 2020-12-21 18:02:37 +01:00
Laurent Destailleur
e6d56a533f
Merge pull request #15799 from ptibogxiv/patch-402 
FIX variant api code v13+
 2020-12-21 18:00:52 +01:00
Laurent Destailleur
dfb632f2d5 Fix phpunit 2020-12-21 17:56:31 +01:00
Laurent Destailleur
4bc0b46556 css 2020-12-21 17:33:57 +01:00
ptibogxiv
4ca6e38f5f
FIX variant api code v13+ 
Better clean code
 2020-12-21 16:07:46 +01:00
Laurent Destailleur
8d901d03fd Fix link 2020-12-21 16:01:47 +01:00
ptibogxiv
94cf393f7f
Update combinations.php 2020-12-21 15:43:45 +01:00
Florian HENRY
4d32529e66 include 2020-12-21 15:25:15 +01:00
Florian HENRY
3deed4678c fix: reslter API need to have correct params as comment 2020-12-21 15:23:04 +01:00
ptibogxiv
cba10bbd4d
FIX: create form variant 
https://github.com/Dolibarr/dolibarr/issues/15759
 2020-12-21 15:18:55 +01:00
Laurent Destailleur
14223d74bd Fix css 2020-12-21 15:00:29 +01:00
Laurent Destailleur
13deb1b1d3 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-12-21 14:54:40 +01:00
Laurent Destailleur
eebdd0bd7a Fix missing date value 2020-12-21 14:54:20 +01:00
Laurent Destailleur
fa9d195ede Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-12-21 14:44:07 +01:00
Laurent Destailleur
d05f9c42f5 Fix bad dir 2020-12-21 14:43:23 +01:00
Laurent Destailleur
7d0e71165a Clean code 2020-12-21 14:40:27 +01:00
Laurent Destailleur
0195c11437 Add missing field required for real funnel of prospection. 2020-12-21 12:58:03 +01:00
Francis Appels
abbe340723 FIX missing reception link in stock movement list. 2020-12-21 12:24:45 +01:00
Laurent Destailleur
6937ab75fa Fix test 2020-12-21 02:31:19 +01:00
Laurent Destailleur
0a19f3cf5b css 2020-12-21 02:27:05 +01:00
Laurent Destailleur
67de45b8d7 Fix responsive 2020-12-21 01:40:15 +01:00
Laurent Destailleur
5dc6f5b89f Prepare 13.0 2020-12-21 01:33:06 +01:00
Laurent Destailleur
d3bd709ad6 Fix phpcs 2020-12-20 18:51:17 +01:00
Laurent Destailleur
0a1387e673 Debug v13 2020-12-20 18:41:54 +01:00
Laurent Destailleur
7fae5ea800 Code clean 2020-12-20 18:21:34 +01:00
Laurent Destailleur
361f13154b Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/lib/functions2.lib.php
	htdocs/fourn/card.php
	htdocs/margin/tabs/thirdpartyMargins.php
	htdocs/societe/card.php
	htdocs/societe/note.php
	htdocs/societe/notify/card.php
	htdocs/societe/societecontact.php
	htdocs/ticket/list.php
 2020-12-20 14:31:54 +01:00
Laurent Destailleur
33f8c53cca Fix var_dump 2020-12-20 14:03:10 +01:00
Laurent Destailleur
8c87050703 FIX Check of customer/vendor code fails in some cases 2020-12-20 13:54:02 +01:00
Frédéric FRANCE
b7b35f4cd4
simplify notications class 2020-12-20 11:04:21 +01:00
Frédéric FRANCE
92f38f664a
Remove no more needed file 2020-12-20 10:44:55 +01:00
Frédéric FRANCE
f9ea75df3d
fix phpcs 2020-12-20 10:28:06 +01:00
Frédéric FRANCE
16d1bf9b00
fix unknown variable 2020-12-20 10:17:28 +01:00
Laurent Destailleur
8d21eab6ab Fix buttond not working 2020-12-20 06:06:24 +01:00
Laurent Destailleur
6066a92b9d Fix API to get country 2020-12-19 22:34:33 +01:00
jove@bisquerra.com
ba4f6c5a6b FIX Open Drawer with new TakePOS connector 2020-12-19 22:28:16 +01:00
Laurent Destailleur
98cf15ba0f Clean APIs 2020-12-19 22:24:58 +01:00
Laurent Destailleur
a27f8bd349 Fix security for some APIs 2020-12-19 22:08:29 +01:00
Laurent Destailleur
e4b1a0bdb0 API to get list of enabled modules 2020-12-19 21:59:41 +01:00
Laurent Destailleur
0c6ccb64e0 Fix links 2020-12-19 21:48:29 +01:00
Laurent Destailleur
fcfd657240 Fix links 2020-12-19 21:41:15 +01:00
Laurent Destailleur
70d1cc79e0 Fix link 2020-12-19 21:30:56 +01:00
Laurent Destailleur
52b064a386 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-12-19 18:52:38 +01:00
Laurent Destailleur
4ed14d4903 Fix title not saved 2020-12-19 18:52:05 +01:00
Laurent Destailleur
157e94a664 Fix trans 2020-12-19 16:50:31 +01:00
Laurent Destailleur
5cbdad7fa7 Fix autofill pass 2020-12-19 16:33:58 +01:00
Laurent Destailleur
7871a41c5c Fix css 2020-12-19 16:24:32 +01:00
Laurent Destailleur
ef4a816c56 CSS 2020-12-19 15:56:21 +01:00
Laurent Destailleur
b41b528f33 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/admin/sms.php
 2020-12-19 15:28:58 +01:00
Laurent Destailleur
31790e255c
Merge pull request #15756 from zuiko/patch-1 
Update V12 fournisseurs.php to Fix #15755 Product: purchase price tab, supplier price table with list of products not "responsive"
 2020-12-19 14:56:16 +01:00
Laurent Destailleur
b6bb08ec2e Fix management of hreflang 2020-12-19 13:44:15 +01:00
ptibogxiv
22b2247442
Update sms.php 2020-12-19 13:41:49 +01:00
Laurent Destailleur
fe93ee4d08 Debug website module for multilanguage 2020-12-19 13:03:40 +01:00
Laurent Destailleur
c112c807ac Fix action after payment on member registration 2020-12-18 19:53:33 +01:00
Laurent Destailleur
dc9ac9d298 Fix missing error message 2020-12-18 16:31:32 +01:00
Laurent Destailleur
0eaf924d3b Add warning on non https website to axplain why features is broken 2020-12-18 15:08:00 +01:00
Laurent Destailleur
832db82fce Fix warnings 2020-12-18 14:40:45 +01:00
Laurent Destailleur
25e4791497 Fix missing creation of master.inc.php file in website import 2020-12-18 14:27:22 +01:00
Laurent Destailleur
90d8299c92 Fix purge tool 2020-12-18 13:24:02 +01:00
Laurent Destailleur
b740d79f8e Fix v13 2020-12-17 22:52:42 +01:00
Laurent Destailleur
3b8947dadd Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/facture/card.php
	htdocs/core/class/html.form.class.php
	htdocs/product/price.php
 2020-12-17 21:50:05 +01:00
Laurent Destailleur
f10c69680c Ajax combo at a better place (after select) 2020-12-17 21:42:10 +01:00
Laurent Destailleur
c97fcaec87 Better fix select2 bug https://github.com/select2/select2/issues/5832 2020-12-17 21:41:39 +01:00
Laurent Destailleur
b5db5f7474 Better responsive 2020-12-17 21:11:44 +01:00
Laurent Destailleur
a67068ab7b Fix warnings 2020-12-17 18:08:56 +01:00
Laurent Destailleur
eed14bd9af Fix warnings 2020-12-17 17:04:42 +01:00
Laurent Destailleur
f79dec80e6 Fix phpcs 2020-12-17 16:45:56 +01:00
Laurent Destailleur
73dfa7d44a Try a better fix for #15770 2020-12-17 14:37:02 +01:00
Laurent Destailleur
768e143188 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2020-12-17 14:10:57 +01:00
Laurent Destailleur
b04cc22350 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 
Conflicts:
	htdocs/admin/prelevement.php
 2020-12-17 14:10:45 +01:00
Laurent Destailleur
f0d787debb Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 2020-12-17 14:07:24 +01:00
Laurent Destailleur
9cd211a79b Fix syntax error 2020-12-17 14:06:54 +01:00
Laurent Destailleur
539afb88fe Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-12-17 14:06:12 +01:00
Laurent Destailleur
9c37b8b806
Merge branch 'develop' into fix/12.0_missing_project_overview_hook 2020-12-17 14:05:04 +01:00
Laurent Destailleur
842d6f695f
Update element.php 2020-12-17 14:01:42 +01:00
Laurent Destailleur
f6b280c9df
Update project.class.php 2020-12-17 13:57:12 +01:00
Laurent Destailleur
e41898280d
Merge pull request #15774 from aspangaro/13b3 
Fix module intracommreport
 2020-12-17 13:55:02 +01:00
Laurent Destailleur
27542ed8ed
Update prelevement.php 2020-12-17 13:53:09 +01:00
Laurent Destailleur
36d6b472ce
Update prelevement.php 2020-12-17 13:52:03 +01:00
Laurent Destailleur
97ed5d1fe9
Merge pull request #15771 from frederic34/bookmark 
Bookmark
 2020-12-17 13:49:27 +01:00
Laurent Destailleur
c092c88dd7 Fix warning 2020-12-17 13:48:28 +01:00
Laurent Destailleur
4dbdcd1475 Fix missing the section with last event on a holiday record 2020-12-17 13:42:20 +01:00
Laurent Destailleur
663d52fef1 Fix warning 2020-12-17 12:31:53 +01:00
Laurent Destailleur
2e02f50993 css 2020-12-17 12:29:52 +01:00
Laurent Destailleur
075181a8d5 Look and feel v13 2020-12-17 12:25:50 +01:00
Laurent Destailleur
d0cc93c608 Fix look and feel v13 2020-12-17 12:09:12 +01:00
Laurent Destailleur
b0d524beed Debug v13 2020-12-17 11:57:12 +01:00
Haldarys
10ac74162e Fix PRELEVEMENT_ADDDAYS check 
If we used a positive value in PRELEVEMENT_ADDDAYS it couldn't submit the changes to database
 2020-12-17 10:19:21 +01:00
Laurent Destailleur
36e0f07090 Remove warning 2020-12-17 08:52:39 +01:00
Alexandre SPANGARO
da439ca0c1 Fix module Intracomm - Structure XML 2020-12-17 06:09:42 +01:00
Alexandre SPANGARO
440c9e4840 Fix module Intracomm 2020-12-17 06:02:28 +01:00
Frédéric FRANCE
3b19151c18
bookmark 2020-12-16 20:15:48 +01:00
Frédéric FRANCE
2cc51c1aef
bookmark class doxygen 2020-12-16 20:13:11 +01:00
Laurent Destailleur
b7876f54cf Fix warning 2020-12-16 19:10:37 +01:00
Laurent Destailleur
5681aeee0f Fix look and feel v13 2020-12-16 19:05:27 +01:00
Laurent Destailleur
edb02ef05a Fix ticket 2020-12-16 19:03:19 +01:00
Laurent Destailleur
9c759e91f0 Fix debug management of docs in ticket module 2020-12-16 19:01:26 +01:00
Laurent Destailleur
82710e54a8 Fix get custom odt templates 2020-12-16 18:10:40 +01:00
Laurent Destailleur
21c2fae00c Fix setup of antivirus 2020-12-16 17:41:18 +01:00
Laurent Destailleur
e4c853b162 Enable module product batch 2020-12-16 17:00:14 +01:00
stickler-ci
e61b71bc93 Fixing style errors. 2020-12-16 15:40:38 +00:00
ATM john
1f29d4f5e8 Add missing hooks 2020-12-16 16:25:30 +01:00
Laurent Destailleur
40ae1808de Look and fell v13 2020-12-16 16:06:33 +01:00
Laurent Destailleur
1f9c597f26 Fix default fields in list 2020-12-16 15:57:52 +01:00
Laurent Destailleur
e7dda7bb4f Move help into tooltip help section 2020-12-16 15:46:54 +01:00
Laurent Destailleur
93b9061a71
Merge pull request #15698 from StephaneLesage/export-categories 
FIX: missing imports/exports of categories
 2020-12-16 15:30:00 +01:00
Laurent Destailleur
1d6e2a01a6
Merge pull request #15762 from aspangaro/13b1 
FIX: Accountancy - Quadra export format - Manage negative amount
 2020-12-16 15:24:14 +01:00
Laurent Destailleur
ef70bdc307
Merge pull request #15764 from aspangaro/13b3 
FIX: Accountancy - Reconciled options not working on ledger et subaccount ledger + CSS
 2020-12-16 15:23:14 +01:00
Laurent Destailleur
eefc74eefc
Merge pull request #15763 from aspangaro/13b2 
NEW: Accountancy - Introduce FEC "2" format to resolve conflict with some software
 2020-12-16 15:21:29 +01:00
Laurent Destailleur
2d841d6b59
Merge pull request #15767 from ninichat/feat/hook_subscription_mail_send 
New: Add sendMail hook in subscription
 2020-12-16 15:18:49 +01:00
Laurent Destailleur
0a38f9e8aa Fix add missing token 2020-12-16 15:16:23 +01:00
Laurent Destailleur
6f75e24fd7 Fix better error management in migration 2020-12-16 15:10:11 +01:00
Corentin Giroud-Argoud
4df0efa43d [New] Add sendMail hook in subscription 
Added sendMail hook in subscription, before a mail is sent to confirm a
subscription. It makes it more flexible for modules to interact with it.
 2020-12-16 13:00:34 +01:00
Laurent Destailleur
d781d78c4e Fix warning 2020-12-16 12:53:31 +01:00
Laurent Destailleur
371a460905 More PHPUnit for movements 2020-12-16 12:26:01 +01:00
Laurent Destailleur
5facd49a6c Fix warnings 2020-12-16 11:33:31 +01:00
Laurent Destailleur
c6f83aaed7 Fix warning 2020-12-16 11:21:48 +01:00
Laurent Destailleur
2c7d872320 Fix warning 2020-12-16 11:07:34 +01:00
Laurent Destailleur
bf01ad8790 Fix warning 2020-12-16 10:55:33 +01:00
atm-lena
cb2c1f3ece FIX Facture Situation Out : status condition 2020-12-16 10:54:32 +01:00
Laurent Destailleur
1b69b1c2fe Fix phpcs 2020-12-16 10:39:10 +01:00
Alexandre SPANGARO
b01a9d6cc3 FIX: Accountancy - Reconciled options not working on ledger et subaccount ledger 2020-12-16 05:32:36 +01:00
Alexandre SPANGARO
ca40d5e52a NEW: Accountancy - Introduce FEC "2" Format to resolve conflict with some software 2020-12-16 05:16:08 +01:00
Alexandre SPANGARO
a03de433be FIX: Accountancy - Quadra export format - Manage negative amount 2020-12-16 05:03:37 +01:00
Alexandre SPANGARO
ca6b8176e9 Merge remote-tracking branch 'upstream/develop' into 13b1 2020-12-16 04:32:26 +01:00
Laurent Destailleur
69061e422b Removed warning 2020-12-16 02:44:48 +01:00
Laurent Destailleur
834058a816 Debug api to create a document 2020-12-16 02:33:21 +01:00
Laurent Destailleur
7005c17569 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/societe/card.php
 2020-12-16 00:32:18 +01:00
Laurent Destailleur
ff8831c936 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-12-16 00:29:10 +01:00
Laurent Destailleur
5fe8c599d2 Fix warning 2020-12-16 00:28:57 +01:00
Laurent Destailleur
17bd362d3c
Merge pull request #15760 from FHenry/fix_duplicate_customersupliercode 
Fix duplicate customersupliercode
 2020-12-16 00:24:16 +01:00
stickler-ci
9ca2e98a66 Fixing style errors. 2020-12-15 21:12:52 +00:00
Florian HENRY
b80bd8d1f8 FIX : dupliacete customer or supplier code must be error dipslayed with new code proposed 2020-12-15 22:03:15 +01:00
Florian HENRY
7a93c11ae0 FIX : dupliacete customer or supplier code must be error dipslayed with new code proposed 2020-12-15 22:01:33 +01:00
Stephane Lesage
7853e77d3f Export/Import categories missing fields and clean 2020-12-15 19:53:47 +01:00
Laurent Destailleur
9d31780155
Merge pull request #15750 from frederic34/intracomm 
Expérimental module intracom
 2020-12-15 18:45:07 +01:00
Laurent Destailleur
37fe5bb3ef Solve blocking feature. Can increase stock of a Kit without changing 
subproduct stock.
 2020-12-15 15:18:01 +01:00
Laurent Destailleur
1f6f4742d5 Trans 2020-12-15 14:01:25 +01:00
Laurent Destailleur
05cb2653f3
Merge pull request #15749 from StephaneLesage/companycard-directedit-type 
Direct edition of type of company in card
 2020-12-15 13:54:06 +01:00
Laurent Destailleur
4856cdb45c
Merge pull request #15752 from davidNDU/develop 
Module builder made module needs this fix
 2020-12-15 13:47:36 +01:00
Laurent Destailleur
479e742d0c FIX #15753 2020-12-15 13:46:13 +01:00
Laurent Destailleur
cee63335a2 FIX #15754 Mor complete PR 2020-12-15 13:38:21 +01:00
Laurent Destailleur
a2bd920371 Fix translation of units 2020-12-15 11:39:18 +01:00
ATM john
50b27239a7 Fix missing hook for project overview control 2020-12-15 11:34:04 +01:00
Laurent Destailleur
2ae1aac5a4 Fix setup 2020-12-15 11:18:29 +01:00
Laurent Destailleur
31693eed21 Fix setup was not clear 2020-12-15 11:10:35 +01:00
Laurent Destailleur
32741dd6f6 Fix warning 2020-12-15 10:51:35 +01:00
Laurent Destailleur
f2a4f880ca Fix warning 2020-12-15 10:49:07 +01:00
Laurent Destailleur
1624b8636f Show timeone 2020-12-15 10:43:19 +01:00
Alexandre SPANGARO
5ec7b01fb4 FIX: Link to subaccount ledger 2020-12-15 09:34:46 +01:00
zuiko
943f1022c0
Update fournisseurs.php 
Product: purchase price tab, the supplier price table with its list of products is not "responsive", as a result, the right-clickable areas, including the "Add purchase price" button, disappear to the right of the screens that are not full HD which forces the user to drag his window with the mouse.
The solution is to change the CSS class of the table to adopt the CSS class of the equivalent table of the selling price tab, which is "responsive" to it.
We therefore replace :
print '<table class="centpercent list">';
by :
print '<table class="noborder centpercent">';

Knowing that the class is used in 24 files, there might be other places where this class poses the same ergonomic problem. I don't know enough Dolibarr to generalize the correction ...
 2020-12-15 09:26:27 +01:00
Laurent Destailleur
506659a9d2 Update jsGant lib to 2.7.3 2020-12-15 03:56:08 +01:00
Laurent Destailleur
d3ba87b09a Better gantt 2020-12-15 02:32:56 +01:00
Laurent Destailleur
de37c0bff0 Fix Warning 2020-12-15 01:59:18 +01:00
Laurent Destailleur
a64f30d23e Fix message 2020-12-15 00:16:58 +01:00
Laurent Destailleur
55deccf364 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-12-14 23:20:21 +01:00
David Bensel
81d47d7460 action=confirm_deleteline ... method_exists has object as first parameter 2020-12-14 23:17:58 +03:00
Laurent Destailleur
66e4de628c Fix permissions 2020-12-14 20:38:22 +01:00
Laurent Destailleur
098f51413f Fix translation 2020-12-14 20:33:27 +01:00
Laurent Destailleur
2d343ab016 Fix 2020-12-14 20:01:17 +01:00
Laurent Destailleur
9595504b56 Fix graph 2020-12-14 19:57:59 +01:00
Laurent Destailleur
5f9b53004b Fix warning 2020-12-14 17:40:40 +01:00
Laurent Destailleur
d9886044a6 Trans 2020-12-14 15:10:31 +01:00
Laurent Destailleur
8114e86cf9 Fix phpcs 2020-12-14 13:40:30 +01:00
Laurent Destailleur
b991badb8c Fix warning 2020-12-14 13:03:43 +01:00
Laurent Destailleur
e612f53494 Fix warning 2020-12-14 13:01:25 +01:00
Laurent Destailleur
107e58403a Fix position of captcha 2020-12-14 12:54:54 +01:00
Laurent Destailleur
43bb5554d7 Clean deprecated page 2020-12-14 12:19:24 +01:00
Laurent Destailleur
d4167fb06c Fix link 2020-12-14 11:35:45 +01:00
Laurent Destailleur
e1e8d76eb9 Fix bad filter 2020-12-14 11:30:39 +01:00
Laurent Destailleur
07cf81be17 Fix search and navigation 2020-12-14 11:28:18 +01:00
Laurent Destailleur
b0e3f1678f Debug v13 2020-12-14 10:58:09 +01:00
Laurent Destailleur
cce0b2f31b Fix code 2020-12-14 10:44:51 +01:00
Laurent Destailleur
ae5da8d55c Fix label 2020-12-14 10:25:31 +01:00
stickler-ci
d32d3060cc Fixing style errors. 2020-12-14 09:15:06 +00:00
Stephane Lesage
5e4cc7fcfd companycard-directedit-typent 2020-12-14 10:14:31 +01:00
Frédéric FRANCE
44d3bc2e64
add work 2020-12-14 08:39:08 +01:00
Laurent Destailleur
d739fa1951 Fix log 2020-12-13 18:32:55 +01:00
Laurent Destailleur
acb73966f7 Clean code. Removed phpexcel library. 2020-12-13 16:27:44 +01:00
Laurent Destailleur
56c32e3c81 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2020-12-13 15:07:33 +01:00
Laurent Destailleur
4f79fdb4ab Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2020-12-13 15:07:25 +01:00
Laurent Destailleur
7886a6e838 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 2020-12-13 15:06:54 +01:00
Laurent Destailleur
3d33d3aa3a Fix warning 2020-12-13 14:36:00 +01:00
Alexandre SPANGARO
35b3d4f40a FIX: Export FEC - Force Carriage Return Line Feed 2020-12-13 14:11:04 +01:00
Laurent Destailleur
427fb16256 Fix warning 2020-12-13 13:29:47 +01:00
Laurent Destailleur
16ae3b83f9 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-12-13 13:02:59 +01:00
Laurent Destailleur
5778b1f022
Merge pull request #15744 from frederic34/mycompanysocialnetworks 
my company social networks
 2020-12-13 12:54:22 +01:00
Laurent Destailleur
ac34fce015
Merge pull request #15696 from StephaneLesage/12importexporticonslabels 
Fix & sync import/export entity icons/labels translation
 2020-12-13 12:50:30 +01:00
Laurent Destailleur
de2531929e Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-12-13 12:39:16 +01:00
Laurent Destailleur
8a0d3e3f6f Fix warning 2020-12-13 12:38:47 +01:00
Frédéric FRANCE
2a9d38575d
add work 2020-12-13 10:51:12 +01:00
Frédéric FRANCE
203fc77e9f
clean 2020-12-13 10:33:59 +01:00
Frédéric FRANCE
4c09e14c49
fix sql error 2020-12-13 10:32:23 +01:00
Frédéric FRANCE
346fe8ae85
clean 2020-12-12 22:35:51 +01:00
Frédéric FRANCE
6c3a9cbc40
clean 2020-12-12 21:27:56 +01:00
Frédéric FRANCE
1b75ac9ffe
add github 2020-12-12 21:17:18 +01:00
Frédéric FRANCE
8aaa1905a0
create url from socialid 2020-12-12 21:03:27 +01:00
Frédéric FRANCE
cd87ee8f92
Merge remote-tracking branch 'upstream/develop' into mycompanysocialnetworks 2020-12-12 20:43:33 +01:00
Juanjo Menent
4fc57d096e Fix #15556 2020-12-12 20:37:00 +01:00
Laurent Destailleur
681dc88188
Merge pull request #15731 from hregis/fix_add_passwordforgotten_hook 
NEW add doAction hook in passwordforgotten page
 2020-12-12 19:51:38 +01:00
Laurent Destailleur
3521a736fc Fix warnings 2020-12-12 19:49:13 +01:00
Frédéric FRANCE
758763f489
Merge remote-tracking branch 'upstream/develop' into mycompanysocialnetworks 2020-12-12 19:25:15 +01:00
Frédéric FRANCE
6a4990d5bd
clean 2020-12-12 19:21:40 +01:00
Laurent Destailleur
75570cc984
Merge pull request #15743 from frederic34/mycompanysocialnetworks 
Mycompany social networks separate tab
 2020-12-12 19:21:29 +01:00
Laurent Destailleur
a5d2e04dea Debug v13 2020-12-12 19:09:07 +01:00
Laurent Destailleur
d19cdae980
Merge pull request #15727 from frederic34/patch-8 
add option hide topmenu in Config/Display
 2020-12-12 18:48:11 +01:00
Laurent Destailleur
f56a38ab23
Merge pull request #15736 from frederic34/api_mos 
Close #15683 fix mos api update
 2020-12-12 18:43:07 +01:00
Laurent Destailleur
96c1429713
Merge pull request #15741 from frederic34/socialnetworkslink 
Socialnetworkslink
 2020-12-12 18:42:00 +01:00
Laurent Destailleur
fa05982a8b Fix CSS v13 2020-12-12 18:37:51 +01:00
Frédéric FRANCE
818af46b86
clean 2020-12-12 18:37:09 +01:00
Frédéric FRANCE
b8a01b4d2d
my company social networks in a separate tab 2020-12-12 18:31:26 +01:00
Frédéric FRANCE
621f246d58
my company social networks in a separate tab 2020-12-12 18:26:54 +01:00
Frédéric FRANCE
643b507a96
ucfirst 2020-12-12 17:31:10 +01:00
Laurent Destailleur
2592344601 Fix missing price2num 2020-12-12 17:27:27 +01:00
Frédéric FRANCE
46bf871127
target 2020-12-12 17:23:42 +01:00
Frédéric FRANCE
d523ed9f85
socialnetworks links 2020-12-12 17:01:25 +01:00
Frédéric FRANCE
4664ac1a1c
socialnetworks links 2020-12-12 17:00:23 +01:00
Laurent Destailleur
b452852b30 Fix phpcs 2020-12-12 16:35:30 +01:00
Laurent Destailleur
5f476e7e7e Compatibility of nusoap with PHP8 2020-12-12 15:37:15 +01:00
Laurent Destailleur
7fdae69546 Fix warning 2020-12-12 14:11:50 +01:00
Laurent Destailleur
a3d302d91c Debug v13 2020-12-12 13:58:21 +01:00
Laurent Destailleur
0968c68cf9 Enhance widget 2020-12-12 12:45:43 +01:00
Laurent Destailleur
bfa8383bed Fix migration script 2020-12-12 12:30:13 +01:00
Laurent Destailleur
33bb1919f0
Merge branch 'develop' into develop#3 2020-12-12 12:23:33 +01:00
Laurent Destailleur
11eb48b60a
Merge pull request #15737 from frederic34/pdfBuildThirdpartyName 
thirdparty need to be object
 2020-12-12 12:16:31 +01:00
Laurent Destailleur
2046b3d042
Merge pull request #15740 from frederic34/pdfproforma 
fix warning
 2020-12-12 12:12:43 +01:00
Frédéric FRANCE
479d709a96
fix warning 2020-12-12 09:39:54 +01:00
Frédéric FRANCE
870f2073ad
fix warning 2020-12-11 22:13:30 +01:00
stickler-ci
87038f953a Fixing style errors. 2020-12-11 19:58:05 +00:00
Frédéric FRANCE
9b2c989906
thirdparty need to be object 2020-12-11 20:57:02 +01:00
Frédéric FRANCE
5ac677e2ab
fix mos api update 2020-12-11 19:02:13 +01:00
Frédéric FRANCE
0b3a5dc796
fix style 2020-12-11 18:09:37 +01:00
Laurent Destailleur
9100e1410e Fix translation, add comments and clean code, fix also a small 
regression on colors for graph with lines
 2020-12-11 17:59:18 +01:00
Frédéric FRANCE
e9288ce0da
fix translation 2020-12-11 17:58:43 +01:00
Frédéric FRANCE
8882759e7a
hide topmenu option in config/display 2020-12-11 17:55:08 +01:00
Laurent Destailleur
18efbebd02 css 2020-12-11 17:11:50 +01:00
Laurent Destailleur
4fa1248d15 Fix avoid duplicate rows after double migration 2020-12-11 16:53:03 +01:00
Laurent Destailleur
91ddcf6446
Merge pull request #15724 from Hystepik/develop#1 
Close #15383 : New format for funnel of prospection
 2020-12-11 16:31:46 +01:00
Laurent Destailleur
ab0b508984
Merge pull request #15720 from zuiko/patch-1 
V13 Update html.form.class.php to complete Fix #15565 Enhanced behaviour to select product on customer/supplier order to be able to use barcode reader efficiently
 2020-12-11 16:31:19 +01:00
Laurent Destailleur
8a0c065163 Debug v13 2020-12-11 16:30:45 +01:00
Laurent Destailleur
1f6f434a9c Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/admin/tools/export_files.php
	test/phpunit/SecurityTest.php
 2020-12-11 15:56:19 +01:00
lmarcouiller
dea75e6158 Close #15729 : fix error on box name and format 2020-12-11 15:55:17 +01:00
Laurent Destailleur
b3d49c4dce Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2020-12-11 15:54:31 +01:00
lmarcouiller
54228ad256 Close #15729 : fix bug with nb jobs 2020-12-11 15:49:47 +01:00
lmarcouiller
a5cf177025 Close #15729 : first push 2020-12-11 15:22:29 +01:00
Laurent Destailleur
4fcd3fe493 Fix disallow -- string into filename for security purpose. Vulnerability 
reported by Yılmaz Değirmenci
 2020-12-11 15:12:42 +01:00
Laurent Destailleur
6a24da54a1 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-12-11 14:49:02 +01:00
Laurent Destailleur
8151e4430b
Merge pull request #15728 from FHenry/dev_add_ecm_files_info_api_docuements 
NEW : add ECM files table info into API document entry GET
 2020-12-11 14:40:40 +01:00
Laurent Destailleur
aa8a6fde84
Merge pull request #15726 from FHenry/develop 
fix: manage price min for PRODUIT_CUSTOMER_PRICES
 2020-12-11 14:36:32 +01:00
Laurent Destailleur
2353ade957
Merge pull request #15732 from frederic34/patch-14 
fix phpcs
 2020-12-11 14:36:04 +01:00
Laurent Destailleur
f4b299e530 Fix generation of PDF 2020-12-11 14:35:13 +01:00
Laurent Destailleur
2adbd29b49 Debug generation of doc from modulebuilder 2020-12-11 14:22:36 +01:00
Frédéric FRANCE
54d51ec557
Update html.form.class.php 2020-12-11 13:46:47 +01:00
Frédéric FRANCE
eb2d7fa657
fix phpcs 2020-12-11 13:43:03 +01:00
Regis Houssin
4d0ce326c4 NEW add doAction hook in passwordforgotten page 2020-12-11 13:31:50 +01:00
Florian HENRY
dca48e4fb6 NEW : add ECM files table info into API document entry GET 2020-12-11 10:21:10 +01:00
Laurent Destailleur
7ac3bb1b67 Debug v13 2020-12-11 02:40:48 +01:00
Laurent Destailleur
697ca3e4f5 Fix selection of duration type 2020-12-11 02:23:43 +01:00
Laurent Destailleur
4ec598d571 Debug v11 2020-12-11 02:12:39 +01:00
Laurent Destailleur
2f8ee92c51 Fix CSS 2020-12-11 02:02:41 +01:00
Laurent Destailleur
206caec290 Debug v13 2020-12-11 01:20:40 +01:00
Laurent Destailleur
cfa194436f Debug v13 2020-12-11 00:55:21 +01:00
Laurent Destailleur
1f28590e5e Fix style 2020-12-10 19:05:54 +01:00
Laurent Destailleur
6b1ce7c050 Fix management of photo of users 2020-12-10 18:58:11 +01:00
Laurent Destailleur
df4d2e1b24 Fix path of user photo 2020-12-10 18:13:30 +01:00
Frédéric FRANCE
d9682df682
hide also topmenu if disabled 2020-12-10 17:37:44 +01:00
Florian HENRY
2653d173b9 Merge HEAD, branch 'develop' of github.com:Dolibarr/dolibarr into develop 2020-12-10 17:16:07 +01:00
Laurent Destailleur
693a7590ef Fix boxes 2020-12-10 17:09:25 +01:00
Laurent Destailleur
c2124479c7 Fix missing test on IMAP 2020-12-10 16:05:43 +01:00
Laurent Destailleur
c850f4c918 Fix fatal error 2020-12-10 16:01:06 +01:00
lmarcouiller
716bb433e8 ajout pictogramme graph dans info box head 2020-12-10 15:50:18 +01:00
Florian HENRY
3438d080f5 Merge HEAD, branch 'develop' of github.com:Dolibarr/dolibarr into develop 2020-12-10 15:09:03 +01:00
Florian HENRY
2a2b372ba9 fix: manage price min for PRICE PER CUSTOMER 2020-12-10 15:08:36 +01:00
Stephane Lesage
bcf4f65cc9 Fix & sync import/export entity icons/labels translation 2020-12-10 14:15:33 +01:00
Laurent Destailleur
59938147b6 Prepare v13 2020-12-10 13:38:12 +01:00
stickler-ci
0a2f656137 Fixing style errors. 2020-12-10 12:19:43 +00:00
lmarcouiller
4f6923442a fix merge and sql synthax 2020-12-10 13:19:10 +01:00
Ferran Marcet
7360fcd03e FIX: Bad rigths to send contract 2020-12-10 13:11:55 +01:00
Laurent Destailleur
d040f53dc2 Update web templates 2020-12-10 13:02:51 +01:00
Laurent Destailleur
be163c684f Fix phpcs 2020-12-10 12:54:13 +01:00
Laurent Destailleur
2c37fe13d6 Fix substitution var keys 2020-12-10 12:14:58 +01:00
Laurent Destailleur
155fa43dc6 Fix substitution var __AMOUNT_TEXT__ 2020-12-10 12:01:22 +01:00
Hystepik
a57b01e9ba
Update box_funnel_of_prospection.php 2020-12-10 11:12:33 +01:00
stickler-ci
492715811c Fixing style errors. 2020-12-10 10:10:12 +00:00
Hystepik
14358f022d
Merge branch 'develop' into develop#1 2020-12-10 11:09:42 +01:00
stickler-ci
38e03778dc Fixing style errors. 2020-12-10 10:07:09 +00:00
lmarcouiller
ecd642e465 Close #15383 : New format for funnel of prospection 2020-12-10 10:58:07 +01:00
Laurent Destailleur
eedaca1476 Fix bad encoding of link 2020-12-10 00:43:51 +01:00
Laurent Destailleur
2c9eb5417a Look and feel v13 2020-12-10 00:20:22 +01:00
Laurent Destailleur
3fcfcb3e88 Fix field declaration 2020-12-09 23:38:24 +01:00
Laurent Destailleur
abe8d25a9a
Merge pull request #15711 from hregis/fix_regenerate_mycompany_thumbs 
FIX regenerate mycompany logos thumbs if not exists
 2020-12-09 22:06:19 +01:00
Laurent Destailleur
44713825e6
Merge pull request #15713 from FHenry/fix_extrafield_chbx 
NEW extrafield checkbox from table (#CrowdFunding_DarkJeff_2021)
 2020-12-09 22:04:31 +01:00
Laurent Destailleur
b8b5d87a09
Merge pull request #15716 from JoolsMcFly/fix/document-api-implementation-notes 
Fix wrong API parameter name in document/buildoc implementation notes
 2020-12-09 22:00:08 +01:00
Laurent Destailleur
dca5b5b1d3
Merge pull request #15710 from hregis/fix_add_hook_for_security 
FIX rename hook to be more explicit and $test = false
 2020-12-09 21:58:47 +01:00
Laurent Destailleur
66ed76c97c
Merge pull request #15718 from frederic34/box_funnel 
fix warnings
 2020-12-09 21:57:43 +01:00
Laurent Destailleur
dac0267a38 Fix debug various payment module. 
Fix debug report income/expense (for situation that should not happen
but if it happen, result is consistent with other screens).
 2020-12-09 21:51:01 +01:00
zuiko
b3ca58d2d0
Update html.form.class.php 
Complete the Fix to #15565 Enhanced behaviour to select product on customer/supplier order to be able to use barcode reader efficiently.
Answer to Eldy, https://github.com/Dolibarr/dolibarr/pull/15704#discussion_r538763166
In fact the change alone to htdocs/core/lib/ajax.lib.php  is not, for me, sufficient to fix the issue.
if $conf->global->PRODUIT_USE_SEARCH_TO_SELECT, 0, the combo remains even if the product is alone.
So I recommend that the code is $conf->global->PRODUIT_USE_SEARCH_TO_SELECT, 1, (wihout combo) for product selection only for customer order filling because for this usage the the probability is higher to use a barcode scanner.
It is less relevant for filling supplier orders (which are not usually entered by barcode scanner), because the combo gives verification information which then disappears. (This is especially true for the purchase price, which is not pre-filled in the box for the moment I tested(?).
 2020-12-09 21:16:25 +01:00
Laurent Destailleur
10a0c98f94 Debug v13 2020-12-09 19:26:41 +01:00
Laurent Destailleur
a0d9d98402 Fix phpcs 2020-12-09 18:03:02 +01:00
Frédéric FRANCE
a256bfeb46
fix warnings 2020-12-09 17:50:21 +01:00
Laurent Destailleur
075cacb8cf Show setup of option SHOW_SUBPRODUCT_REF_IN_PDF 2020-12-09 17:40:28 +01:00
Laurent Destailleur
f56b46bd3e Debug v13 2020-12-09 17:14:35 +01:00
Laurent Destailleur
51738e7e60 Fix links into translation strings 2020-12-09 17:02:26 +01:00
Jools
5ef73bf882
Change module_part to modulepart 2020-12-09 16:26:31 +01:00
lmarcouiller
83286d99be funnel horizontal bar 2020-12-09 13:31:14 +01:00
Laurent Destailleur
d7434ce97a Fix css 2020-12-09 12:42:21 +01:00
Laurent Destailleur
89828c18d1 CSS 2020-12-09 12:32:21 +01:00
Laurent Destailleur
7459607eb9 Look fix 2020-12-09 12:23:37 +01:00
Florian HENRY
29b682d810 fix extrafield checkbox from table (#CroudFounding_DarkJeff_2021) 2020-12-09 10:35:30 +01:00
Regis Houssin
c18e8ac317 FIX regenerate mycompany logos thumbs if not exists 2020-12-09 09:28:46 +01:00
Regis Houssin
37193557df FIX rename hook to be more explicit and $test = false 2020-12-09 08:56:39 +01:00
Laurent Destailleur
a92ad1484a
Merge pull request #15709 from hregis/fix_add_hook_for_security 
NEW add hook "loginCheckSecurityAccess" (eg for external captcha)
 2020-12-08 23:08:17 +01:00
Laurent Destailleur
a5eb2e56cb Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/product/card.php
 2020-12-08 22:27:27 +01:00
Laurent Destailleur
89854ea137 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2020-12-08 22:24:14 +01:00
Laurent Destailleur
75b8794d72 Fix column must be NULL 2020-12-08 22:23:24 +01:00
Laurent Destailleur
e987e6e093 Context for hook showSocinfoOnPrint has been moved from 
"showsocinfoonprint" to "main"
 2020-12-08 22:16:38 +01:00
Laurent Destailleur
51128c1d55
Merge pull request #15692 from ATM-Consulting/FIX/12.0_regression_basic_html_tags_no_longer_allowed_in_product_label 
FIX 12.0 - XSS protection too stringent -> replace 'alphanohtml' with 'restricthtml'
 2020-12-08 22:09:27 +01:00
Laurent Destailleur
70b772cf74 Kit must show details on PDF. 2020-12-08 21:56:48 +01:00
Laurent Destailleur
c26efd756f FIX #15704 #15565 #15694 2020-12-08 20:53:42 +01:00
Laurent Destailleur
769a8886b9 Debug notification on events 2020-12-08 20:32:37 +01:00
Laurent Destailleur
bfa813e1b0 Load langs 2020-12-08 20:16:41 +01:00
Laurent Destailleur
5b031473ff Fix hide table if empty 2020-12-08 20:08:14 +01:00
Laurent Destailleur
bb6f23d81b CSS 2020-12-08 19:32:43 +01:00
Regis Houssin
3836e5685a FIX same context of others 2020-12-08 19:30:40 +01:00
Regis Houssin
724d03c754 NEW add hook "loginCheckSecurityAccess" (eg for external captcha) 2020-12-08 19:26:24 +01:00
Laurent Destailleur
be249538ee Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/accountancy/class/accountancyexport.class.php
 2020-12-08 18:17:02 +01:00
Laurent Destailleur
34e7943d09 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 
Conflicts:
	htdocs/fourn/class/paiementfourn.class.php
 2020-12-08 18:14:56 +01:00
Laurent Destailleur
4e72543fde Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 
Conflicts:
	htdocs/accountancy/class/accountancyexport.class.php
	htdocs/fourn/class/paiementfourn.class.php
	htdocs/fourn/paiement/card.php
 2020-12-08 18:11:39 +01:00
Laurent Destailleur
cc1db8aec2 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-12-08 18:03:20 +01:00
Laurent Destailleur
a0b1bd3eca Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/expedition/card.php
	htdocs/product/class/product.class.php
 2020-12-08 18:03:01 +01:00
Laurent Destailleur
0234df6224
Merge pull request #15705 from StephaneLesage/fix-boxes-thirdparty 
Fix boxes third-parties information
 2020-12-08 17:58:09 +01:00
Laurent Destailleur
791d129c9c
Merge pull request #15699 from hregis/fix_bcc_only_if_not_exists 
FIX add autocopy to if not already exists in $to
 2020-12-08 17:56:04 +01:00
Laurent Destailleur
ad0a0460ac
Merge pull request #15706 from FHenry/develop 
fix survey module
 2020-12-08 17:54:08 +01:00
Laurent Destailleur
aaf1910c25 Fix stock amount can be a decimal 2020-12-08 17:53:12 +01:00
Laurent Destailleur
996e01fe6a Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2020-12-08 17:52:01 +01:00
Laurent Destailleur
485fe0fc62 FIX Can receipt of a product that required lot after disabling stock and 
lot module
 2020-12-08 17:51:26 +01:00
Laurent Destailleur
0f2a8d0262 Fix timestamp field 2020-12-08 17:20:45 +01:00
Laurent Destailleur
240648d540 css 2020-12-08 17:09:48 +01:00
Stephane Lesage
376e4d150a Third-party details in comm action lists 2020-12-08 15:56:42 +01:00
Stephane Lesage
e25862ec8d Third-party details in Lists in comm index 2020-12-08 15:47:34 +01:00
Stephane Lesage
5d8dfadd09 Third-party details in Lists in project index 2020-12-08 15:47:22 +01:00
Stephane Lesage
3161f35971 Fix boxes third-parties information 2020-12-08 14:08:32 +01:00
Florian HENRY
eed7f57f98 fix survey module 2020-12-08 12:54:14 +01:00
Florian HENRY
b3dd456a37 fix survey module 2020-12-08 12:53:13 +01:00
Laurent Destailleur
8491be2572 Fix look and feel v13 2020-12-08 11:58:47 +01:00
Florian Mortgat
617c9f7ea9 FIX: enable HTML in product labels depending on conf MAIN_SECURITY_ALLOW_UNSECURED_LABELS_WITH_HTML 2020-12-08 09:30:31 +01:00
Regis Houssin
fc34c97666 FIX add autocopy to if not already exists in $to 2020-12-08 08:49:06 +01:00
Stephane Lesage
08ccc11f9e Export warehouses 2020-12-08 00:50:27 +01:00
Alexandre SPANGARO
7c77a0d84b FIX : Export FEC - Remove line at zero 2020-12-07 23:53:09 +01:00
Laurent Destailleur
86e1082138
Merge pull request #15644 from Hystepik/develop#1 
New #8172 : PHPExcel replaced by PHPSpreadSheet
 2020-12-07 23:06:21 +01:00
Laurent Destailleur
f21a4e8aed
Merge branch 'develop' into develop#3 2020-12-07 22:46:36 +01:00
Laurent Destailleur
6e479af5b6
Merge pull request #15661 from frederic34/adminsms 
fix trans removing html
 2020-12-07 22:45:14 +01:00
Laurent Destailleur
c6d253ba94
Merge pull request #15660 from Ahuahuachi/develop 
Translate phpDocs
 2020-12-07 22:41:51 +01:00
Laurent Destailleur
465cee7e92
Merge pull request #15662 from frederic34/boxproduits 
fix missing fields in box
 2020-12-07 22:41:20 +01:00
Laurent Destailleur
ff1e6ec371
Merge pull request #15665 from frederic34/admin_boxes 
fix style
 2020-12-07 22:40:51 +01:00
Laurent Destailleur
64e2ddbd80
Merge pull request #15666 from Zebedeu/develop 
New #8472 personal and professional titles added
 2020-12-07 22:40:01 +01:00
Laurent Destailleur
d9ba821411
Merge pull request #15669 from frederic34/template 
typo ortho
 2020-12-07 22:35:45 +01:00
Laurent Destailleur
995afd59f2
Merge pull request #15672 from frederic34/patch-8 
fix trans replace html
 2020-12-07 22:35:01 +01:00
Laurent Destailleur
6beba9e351
Merge pull request #15674 from frederic34/patch-14 
fix undefined variable
 2020-12-07 22:34:10 +01:00