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

84367 Commits

Author SHA1 Message Date
Alexandre SPANGARO
0abe576fdc FIX: Various payment - Missing fields for check transmitter & bank name 2021-03-01 04:49:06 +01:00
Alexandre SPANGARO
d0ccdfafb4 FIX stats supplier proposal 2021-03-01 04:12:53 +01:00
Alexandre SPANGARO
abc93446bb Fix list proposal 2021-03-01 04:12:15 +01:00
Alexandre SPANGARO
3b1a9cd668 FIX: Total_ht not show in contract link element 2021-03-01 03:18:14 +01:00
Alexandre SPANGARO
0d954cb1c7 FIX: Total_ht not show in contract link element 2021-03-01 03:09:36 +01:00
Frédéric FRANCE
ed3b637d7a
add new rule 2021-03-01 00:34:15 +01:00
Frédéric FRANCE
1b046f25cf
add new rule 2021-03-01 00:19:52 +01:00
Laurent Destailleur
77151bd560 Standardize tabs 2021-02-28 23:53:20 +01:00
Frédéric FRANCE
0a6f307716
code syntax cron directory 2021-02-28 23:47:30 +01:00
Laurent Destailleur
bcdfdae10c FIX #16480 2021-02-28 23:43:07 +01:00
Laurent Destailleur
f7933a6884
Merge pull request #16470 from frederic34/s_code_syntax 
code syntax s... t..  dir
 2021-02-28 23:37:25 +01:00
Laurent Destailleur
26c8ee170f
Merge pull request #16469 from frederic34/r_code_syntax 
code syntax r... dir
 2021-02-28 23:37:14 +01:00
Laurent Destailleur
490faec547 FIX Timezone problems 
Conflicts:
	htdocs/core/lib/date.lib.php
	test/phpunit/DateLibTest.php
 2021-02-28 22:50:21 +01:00
Laurent Destailleur
ae81ab0c7c FIX Timezone problems 2021-02-28 22:44:11 +01:00
Alexandre SPANGARO
de241eced3 FIX: Total_ht not show in contract link element 2021-02-28 22:22:20 +01:00
Laurent Destailleur
a6bc218280 Look and feel v14 2021-02-28 21:34:27 +01:00
Laurent Destailleur
5406de13ee css 2021-02-28 21:33:13 +01:00
Laurent Destailleur
0a0c7fdeb1 FIX hourglass and hide button to pay 2021-02-28 21:15:40 +01:00
Laurent Destailleur
79ed52c3d3 NEW Add last date of modification for website pages in list 2021-02-28 20:49:52 +01:00
Frédéric FRANCE
9e8aefbc75
Merge remote-tracking branch 'upstream/develop' into s_code_syntax 2021-02-28 17:49:17 +01:00
Frédéric FRANCE
ce9f09ae4e
Merge remote-tracking branch 'upstream/develop' into r_code_syntax 2021-02-28 17:41:39 +01:00
Frédéric FRANCE
709e2459e9
fix 2021-02-28 17:17:30 +01:00
Laurent Destailleur
87bc0f9c24 Fix align 2021-02-28 14:28:41 +01:00
Laurent Destailleur
6294ae61a8 Look and feel v14 2021-02-28 14:26:32 +01:00
Laurent Destailleur
886cbc61c8 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/commande/card.php
	htdocs/core/boxes/box_factures_fourn.php
	htdocs/core/boxes/box_factures_fourn_imp.php
	htdocs/core/boxes/box_ficheinter.php
	htdocs/core/boxes/box_members.php
	htdocs/core/boxes/box_propales.php
	htdocs/core/class/commonobject.class.php
	htdocs/core/class/html.formmail.class.php
	htdocs/core/lib/functions.lib.php
	htdocs/fourn/class/fournisseur.facture.class.php
 2021-02-28 13:37:45 +01:00
Laurent Destailleur
2a3b3753a8 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 2021-02-28 13:27:38 +01:00
Laurent Destailleur
12ff29cc83
Merge pull request #16468 from frederic34/public_code_syntax 
code syntax public dir
 2021-02-28 13:26:44 +01:00
Laurent Destailleur
68aebaeade
Merge pull request #16479 from frederic34/update_CommandeFournisseur 
add update CommandeFournisseur for api use
 2021-02-28 13:26:28 +01:00
Laurent Destailleur
c7d02ef38a
Merge pull request #16471 from frederic34/eventorg_code_syntax 
code syntax eventorganization dir
 2021-02-28 13:25:44 +01:00
Laurent Destailleur
3a2d300a17
Merge pull request #16472 from frederic34/admin_code_syntax 
code syntax admin dir
 2021-02-28 13:25:31 +01:00
Laurent Destailleur
0bb304ec33
Merge pull request #16473 from frederic34/patch-3 
fix variable name
 2021-02-28 13:25:20 +01:00
Laurent Destailleur
dd64c00f8b
Merge pull request #16478 from frederic34/patch-5 
fix missing include
 2021-02-28 13:24:42 +01:00
Laurent Destailleur
1149de1aca FIX #16485 2021-02-28 13:15:24 +01:00
Laurent Destailleur
2ce76133f4 FIX #16487 2021-02-28 12:59:58 +01:00
Laurent Destailleur
3a19cbb062 FIX #16420 #16423 #16488 #16477 2021-02-28 12:47:24 +01:00
Laurent Destailleur
0832c25b5b Look and feel v14 2021-02-28 11:48:35 +01:00
Laurent Destailleur
753b1d1e11 FIX status on tooltip on widgets 2021-02-27 19:43:56 +01:00
Laurent Destailleur
4cf2d2317f FIX Status in popup of member in widget 2021-02-27 19:16:14 +01:00
Laurent Destailleur
747acd6764 Trans 2021-02-27 18:53:27 +01:00
Laurent Destailleur
7dace2f459 Show 3 years in graph of widget by default. 2021-02-27 18:38:32 +01:00
Laurent Destailleur
3705409d56 Code change to follow modulebuilder template 2021-02-27 18:33:01 +01:00
Laurent Destailleur
9cf4222d3a Look and feel v14 2021-02-27 17:15:40 +01:00
Florian HENRY
d5dc95d99e add status column 2021-02-27 15:36:36 +01:00
Florian HENRY
045a96e415 Merge branch 'dev_EventOrganisation' of github.com:FHenry/dolibarr into dev_EventOrganisation 2021-02-27 15:35:17 +01:00
Florian HENRY
5221b59539 set correct field name as conference or booth are in actioncomm table 2021-02-27 15:34:28 +01:00
stickler-ci
eca98237f0 Fixing style errors. 2021-02-27 13:57:52 +00:00
Florian HENRY
1041291bda manage status 2021-02-27 14:24:41 +01:00
Florian HENRY
8bb0ff065a add missing column on actioncomm 2021-02-27 14:19:02 +01:00
Florian HENRY
eb17ae5fe2 fix event type select 2021-02-27 14:13:42 +01:00
Florian HENRY
bf04a8cf1b ongoing 2021-02-27 13:35:16 +01:00
Florian HENRY
5e0ca7417e Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_EventOrganisation_draft 2021-02-27 13:16:37 +01:00
Florian HENRY
f13ef50768 set good agenda type event 2021-02-27 13:13:42 +01:00
Laurent Destailleur
5c0ea476e1 Look and feel v14 2021-02-27 12:45:07 +01:00
Frédéric FRANCE
6823eabe63
add update CommandeFournisseur for api use 2021-02-27 10:10:28 +01:00
Frédéric FRANCE
8a782e1d4a
fix missing include 
needed by dol_get_last_hour
 2021-02-27 09:18:03 +01:00
Frédéric FRANCE
8bfa7565bd
Update commonobject.class.php 2021-02-27 08:52:40 +01:00
Frédéric FRANCE
2cc635fd09
FIX https://github.com/Dolibarr/dolibarr/issues/16465 2021-02-27 08:00:02 +01:00
Laurent Destailleur
4c7d78ffaa Look and feel v14 2021-02-27 03:06:21 +01:00
Laurent Destailleur
cf23df9f28 Fix field hidden by default (not used) 2021-02-27 03:06:05 +01:00
Laurent Destailleur
0f9d9625ad Look and feel v14 2021-02-27 02:49:24 +01:00
Laurent Destailleur
34d00e5d5e Look and feel v14 2021-02-27 02:44:52 +01:00
Laurent Destailleur
56508816d2 Look and feel v14 2021-02-27 02:02:35 +01:00
Laurent Destailleur
84219689a6 Look and feel v14 2021-02-27 02:00:00 +01:00
Laurent Destailleur
8e632d08b8 NEW Add link picto to the stock movement on the detail of production 2021-02-27 00:31:29 +01:00
abb
c4a3a289a9 fix:fk_region links to region code field and not to the rowid 2021-02-26 23:39:52 +01:00
Frédéric FRANCE
5d4004d3f4
fix cache 2021-02-26 23:06:33 +01:00
Frédéric FRANCE
94aa116fa8
fix variable name 2021-02-26 23:01:18 +01:00
Frédéric FRANCE
608b933ef5
code syntax admin dir 2021-02-26 22:04:03 +01:00
Frédéric FRANCE
6ad1f18187
code syntax eventorganization dir 2021-02-26 21:22:52 +01:00
Frédéric FRANCE
ebfba19778
code syntax s... t.. dir 2021-02-26 21:17:52 +01:00
Frédéric FRANCE
58646c9271
Merge remote-tracking branch 'upstream/develop' into public_code_syntax 2021-02-26 20:55:08 +01:00
Frédéric FRANCE
2137486e55
code syntax r... dir 2021-02-26 20:53:03 +01:00
Laurent Destailleur
0d4acc53e2 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-02-26 19:39:24 +01:00
Laurent Destailleur
c1a75d7b70 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-02-26 19:39:17 +01:00
Laurent Destailleur
e7da1d7fe4 FIX #16431 2021-02-26 19:38:18 +01:00
Laurent Destailleur
a0a6b98f87
Merge pull request #16467 from frederic34/project_code_syntax 
code syntax project
 2021-02-26 19:25:26 +01:00
Laurent Destailleur
c402a2f37f
Merge pull request #16461 from daraelmin/daraelmin-patch-4 
Daraelmin patch 4
 2021-02-26 19:25:10 +01:00
Laurent Destailleur
8574d4c987
Merge pull request #16464 from frederic34/m_code_syntax 
code syntax m... directories
 2021-02-26 19:24:18 +01:00
Laurent Destailleur
338ee6563b
Merge pull request #16463 from frederic34/hrm_code_syntax 
code syntax hrm imports install intracommreport loan directory
 2021-02-26 19:24:03 +01:00
Laurent Destailleur
7498721629
Merge pull request #16462 from frederic34/ftpholiday_code_syntax 
code syntax ftp holiday directory
 2021-02-26 19:23:53 +01:00
Laurent Destailleur
dd72a52e8f Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/accountancy/bookkeeping/balancebymonth.php
	htdocs/accountancy/class/accountancyexport.class.php
 2021-02-26 19:23:23 +01:00
Laurent Destailleur
81c2ae325b Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 2021-02-26 19:20:32 +01:00
Laurent Destailleur
129120523c Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-02-26 19:20:10 +01:00
Laurent Destailleur
0315fb5fc3 Fix missing in v13 2021-02-26 19:19:48 +01:00
Laurent Destailleur
d5566dbf8f FIX #16431 2021-02-26 19:18:03 +01:00
Frédéric FRANCE
df6650241d
code syntax public dir 2021-02-26 18:58:34 +01:00
Frédéric FRANCE
a82df7e6ea
code syntax project 2021-02-26 18:49:22 +01:00
Frédéric FRANCE
16ea342904
code syntax 2021-02-26 18:37:22 +01:00
Frédéric FRANCE
0411321bbe
Merge remote-tracking branch 'origin/m_code_syntax' into m_code_syntax 2021-02-26 18:34:31 +01:00
Frédéric FRANCE
d442ef48ec
Merge remote-tracking branch 'upstream/develop' into m_code_syntax 2021-02-26 18:33:21 +01:00
stickler-ci
6aaf1c2962 Fixing style errors. 2021-02-26 17:28:25 +00:00
Frédéric FRANCE
f73c0abec1
code syntax m... directories 2021-02-26 18:26:44 +01:00
Frédéric FRANCE
6cef78befb
code syntax hrm imports install intracommreport loan directory 2021-02-26 18:20:21 +01:00
stickler-ci
629efe7d5a Fixing style errors. 2021-02-26 17:14:26 +00:00
Frédéric FRANCE
5f1d7ee763
code syntax ftp holiday directory 2021-02-26 17:59:31 +01:00
daraelmin
739cd0466d
Fix Dolibarr#16418 missing title in "iNew cCash Fence" 2021-02-26 17:24:39 +01:00
daraelmin
1b6bc8b132
Fix #16418 missing in "Tags of transactions" 2021-02-26 17:18:09 +01:00
daraelmin
0749585687
Fix #16418 title in "Transaction list by category" 2021-02-26 17:11:18 +01:00
daraelmin
ea18a47113
Fix #16418 missing title in "internal transfer" 2021-02-26 17:01:53 +01:00
Laurent Destailleur
50ae2d33b2
Merge pull request #16460 from frederic34/product_code_syntax 
Product code syntax
 2021-02-26 16:47:53 +01:00
Laurent Destailleur
fcdd550d7c
Merge pull request #16112 from fappels/develop_mo_pmp 
Add missing pmp valorisation to MO production. (Issue #16072)
 2021-02-26 16:46:40 +01:00
Frédéric FRANCE
96b0f3a25c
code syntax directory 2021-02-26 16:19:52 +01:00
Frédéric FRANCE
7ac8fcbca1
Merge remote-tracking branch 'origin/product_code_syntax' into product_code_syntax 2021-02-26 16:12:57 +01:00
Frédéric FRANCE
8029a3317f
Merge remote-tracking branch 'upstream/develop' into product_code_syntax 2021-02-26 16:11:34 +01:00
stickler-ci
487876101f Fixing style errors. 2021-02-26 15:00:47 +00:00
atm-lena
292076e5dd Ajout conf qui permet de décocher / cocher par défaut le paiement automatique des salaires 2021-02-26 15:59:27 +01:00
Francis Appels
3216120f44 MoLine origin is bomline not bom 2021-02-26 15:38:02 +01:00
Gauthier PC portable 024
e598b49545 Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW/add_real_payments_on_salaries 2021-02-26 15:33:36 +01:00
Frédéric FRANCE
155aeb6213
code syntax opensurvey directory 2021-02-26 15:27:57 +01:00
Frédéric FRANCE
be59a70e39
code syntax paypal paybox directory 2021-02-26 15:27:05 +01:00
Frédéric FRANCE
c5ff699b3f
code syntax printing directory 2021-02-26 15:26:09 +01:00
Laurent Destailleur
5095e7f927
Merge pull request #16124 from hregis/fix_avoid_missing_url_and_token 
Fix avoid missing url and token
 2021-02-26 15:21:56 +01:00
Laurent Destailleur
c4e98486f7 Trans 2021-02-26 15:15:55 +01:00
Laurent Destailleur
b95fd1697f
Merge pull request #16434 from altairisfr/serials_pr 
differentiate serial numbers from lot management
 2021-02-26 15:06:35 +01:00
Laurent Destailleur
5d0a0fe341 Clean code 2021-02-26 14:53:16 +01:00
Laurent Destailleur
92e65291e6 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-02-26 14:33:53 +01:00
Laurent Destailleur
93f0754be9 Fix removed a bugged section (not used, was in develop mode only) 2021-02-26 14:33:27 +01:00
Frédéric FRANCE
fa7cd70052
code syntax product directory 2021-02-26 14:25:17 +01:00
Laurent Destailleur
2f649d6582
Merge pull request #16459 from frederic34/theme_code_syntax 
code syntax theme directory
 2021-02-26 13:52:42 +01:00
Laurent Destailleur
2604426499
Merge pull request #16458 from frederic34/ticket_code_syntax 
code syntax ticket directory
 2021-02-26 13:52:33 +01:00
Frédéric FRANCE
920dabaab7
code syntax theme directory 2021-02-26 13:31:09 +01:00
Frédéric FRANCE
4c1004ea5d
code syntax ticket directory 2021-02-26 13:27:00 +01:00
Laurent Destailleur
6e49a0afa3
Merge pull request #16457 from frederic34/user_code_syntax 
code syntax user directory
 2021-02-26 13:25:16 +01:00
Laurent Destailleur
8aefb1b641
Merge pull request #16426 from josemariagomezroncero/patch-9 
NEW Set status of all variant when setting status of parent
 2021-02-26 13:25:04 +01:00
Laurent Destailleur
afcc3cb3e6
Update ProductCombination.class.php 2021-02-26 13:24:30 +01:00
Laurent Destailleur
77356afd03 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-02-26 13:22:28 +01:00
Laurent Destailleur
9e202467e0 Code comment 2021-02-26 13:22:13 +01:00
Laurent Destailleur
a9aa4b439a
Merge pull request #16456 from frederic34/variants_code_syntax 
code syntax variants webservice directory
 2021-02-26 13:19:48 +01:00
Laurent Destailleur
e43314e81c
Merge pull request #16453 from frederic34/zapier_code_syntax 
code syntax zapier directory
 2021-02-26 13:19:38 +01:00
Frédéric FRANCE
b970f4eca6
code syntax user directory 2021-02-26 13:18:40 +01:00
Laurent Destailleur
618d40d1a5
Merge branch 'develop' into develop 2021-02-26 13:17:12 +01:00
Laurent Destailleur
9fb15bde99
Merge pull request #16429 from bafbes/abb120369 
Add region code and id into fetch of thirdparty
 2021-02-26 13:16:00 +01:00
Laurent Destailleur
a296b86ee1
Update societe.class.php 2021-02-26 13:15:02 +01:00
stickler-ci
2cbdbf4f60 Fixing style errors. 2021-02-26 12:12:30 +00:00
Frédéric FRANCE
9fb263bcd7
Merge remote-tracking branch 'upstream/develop' into zapier_code_syntax 2021-02-26 13:11:57 +01:00
Frédéric FRANCE
db871994fb
code syntax variants webservice directory 2021-02-26 13:10:10 +01:00
Laurent Destailleur
ad63ac6bb0
Update societe.class.php 2021-02-26 13:08:24 +01:00
Laurent Destailleur
0d7a2c1d81
Merge pull request #16406 from frederic34/bom_codesyntax 
code syntax bom directory
 2021-02-26 13:05:45 +01:00
Laurent Destailleur
1c371d6bfa
Merge pull request #16414 from frederic34/contract_code_syntax 
code syntax contrat directory
 2021-02-26 13:05:36 +01:00
Laurent Destailleur
44d4fb6517
Merge pull request #16407 from frederic34/casdesk_code_syntax 
code syntax cashdesk directory
 2021-02-26 13:05:27 +01:00
Laurent Destailleur
aaf1863486
Merge pull request #16405 from frederic34/api_codesyntax 
code syntax api directory
 2021-02-26 13:05:18 +01:00
Laurent Destailleur
9c6a6baec3
Merge pull request #16455 from frederic34/patch-3 
really fix typo
 2021-02-26 13:05:02 +01:00
Laurent Destailleur
a5925cc2cb
Merge branch 'develop' into count_project_head 2021-02-26 13:02:54 +01:00
Frédéric FRANCE
cb1e36de9c
really fix typo 2021-02-26 12:58:41 +01:00
Laurent Destailleur
09bc6bd552
Merge pull request #16422 from inovea-conseil/takepos_priceht 
NEW option for Takepos
 2021-02-26 12:57:39 +01:00
Laurent Destailleur
5ac6fa1ed6
Merge pull request #16400 from frederic34/patch-2 
fix typo
 2021-02-26 12:56:30 +01:00
Laurent Destailleur
66fba16448
Merge pull request #16424 from frederic34/patch-4 
typo
 2021-02-26 12:56:09 +01:00
Laurent Destailleur
97ddc6890e
Merge pull request #16454 from frederic34/website_code_syntax 
code syntax website directory
 2021-02-26 12:55:49 +01:00
Laurent Destailleur
886965be76 Show product on lot record tab document 2021-02-26 12:54:57 +01:00
Laurent Destailleur
f5406d487b Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/facture/card.php
	htdocs/core/class/html.formmail.class.php
	htdocs/core/lib/product.lib.php
	htdocs/product/stock/productlot_card.php
	test/phpunit/SecurityTest.php
 2021-02-26 12:53:06 +01:00
Laurent Destailleur
9ebf5c2be1 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 2021-02-26 12:48:08 +01:00
Laurent Destailleur
16906abc09 FIX File attachment on lots 2021-02-26 12:47:57 +01:00
Laurent Destailleur
00d2d28d68 NEW: Can create a lot from list 
Make code like modulebuilder
 2021-02-26 12:34:41 +01:00
Frédéric FRANCE
256001ebd6
code syntax website directory 2021-02-26 12:03:07 +01:00
Frédéric FRANCE
7d97d16eeb
code syntax zapier directory 2021-02-26 11:59:13 +01:00
Juanjo Menent
badd46e289 FIX: Bad project filter in ticket list 2021-02-26 11:53:23 +01:00
Christophe Battarel
4aaf9e133a change translation 2021-02-26 11:51:23 +01:00
Laurent Destailleur
34ed5519fd
Merge pull request #16435 from altairisfr/batchevents_pr 
add event management to batch products
 2021-02-26 11:50:48 +01:00
Gauthier PC portable 024
c996871f98 Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW/add_real_payments_on_salaries 2021-02-26 11:50:18 +01:00
Laurent Destailleur
60016cc3f3 Fix phpcs 2021-02-26 11:29:16 +01:00
Laurent Destailleur
634d94b0b7 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 2021-02-26 11:27:27 +01:00
Laurent Destailleur
0f44bdb90f Fix sql error 2021-02-26 11:27:03 +01:00
Laurent Destailleur
adc0313543 Fix lang 2021-02-26 11:09:15 +01:00
Laurent Destailleur
2670d4fc17 Look and feel v14 2021-02-26 11:00:58 +01:00
Laurent Destailleur
aba43b3e35 Fix init before 2021-02-26 10:44:52 +01:00
Laurent Destailleur
67db1d4937
Merge pull request #16427 from dvdwalker/ajax-fix 
Fix: Option MAIN_DIRECT_STATUS_UPDATE broken. Ajax on/off not saving value in DB after updating to version >=12
 2021-02-26 10:39:58 +01:00
Laurent Destailleur
ff2a348ac4
Merge pull request #16442 from frederic34/ecm_code_syntax 
code syntax ecm emailcollector directories
 2021-02-26 10:35:01 +01:00
Laurent Destailleur
8086737be7
Merge pull request #16438 from frederic34/patch-5 
fix translation
 2021-02-26 10:34:47 +01:00
Laurent Destailleur
4b846fd6e8
Merge pull request #16440 from frederic34/delivery_code_syntax 
code syntax delivery directory
 2021-02-26 10:34:29 +01:00
Laurent Destailleur
8b4a33ba38
Merge pull request #16439 from frederic34/datapolicy_code_syntax 
code syntax datapolicy dav debugbar directories
 2021-02-26 10:34:08 +01:00
Laurent Destailleur
cec9c65ab8
Merge pull request #16449 from daraelmin/daraelmin-patch-3 
Fix #16420 undefined  $model_mail_selected_id
 2021-02-26 10:33:56 +01:00
Laurent Destailleur
e7ae2e65d7
Update html.formmail.class.php 2021-02-26 10:33:49 +01:00
Laurent Destailleur
4e6562fad5
Merge pull request #16441 from frederic34/don_code_syntax 
code syntax don directory
 2021-02-26 10:33:13 +01:00
Laurent Destailleur
bfc2cb509f
Merge pull request #16443 from frederic34/expedition_code_syntax 
code syntax expedition directory
 2021-02-26 10:33:01 +01:00
Laurent Destailleur
48e9078ced
Merge pull request #16444 from frederic34/expensereport_code_syntax 
code syntax expensereport directory
 2021-02-26 10:32:28 +01:00
Laurent Destailleur
dcb1080b16
Merge pull request #16445 from frederic34/exports_code_syntax 
code syntax exports externalsite directory
 2021-02-26 10:32:19 +01:00
Laurent Destailleur
65195af778
Merge pull request #16448 from daraelmin/patch-1 
Fix #16420 - V13.0.1 - undefined $model_mail_selected_id
 2021-02-26 10:32:06 +01:00
Laurent Destailleur
e0785ac5ef
Update html.formmail.class.php 2021-02-26 10:31:02 +01:00
Laurent Destailleur
69c974800c
Update html.formmail.class.php 2021-02-26 10:30:30 +01:00
Laurent Destailleur
e84e7d881f
Merge pull request #16447 from frederic34/fourn_code_syntax 
code syntax fourn directory
 2021-02-26 10:29:42 +01:00
Laurent Destailleur
72691a3a63
Merge pull request #16446 from frederic34/fichinter_code_syntax 
code syntax fichinter directory
 2021-02-26 10:29:33 +01:00
Laurent Destailleur
7b70d4b1de
Merge pull request #16415 from frederic34/core_code_syntax 
code syntax core directory
 2021-02-26 10:29:23 +01:00
Laurent Destailleur
d1e530e108 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 2021-02-26 10:28:05 +01:00
Laurent Destailleur
1a521bcc99 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/contact/class/contact.class.php
 2021-02-26 10:27:55 +01:00
Laurent Destailleur
5c0fba26e2 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2021-02-26 10:25:55 +01:00
Laurent Destailleur
549136efeb Removed useless log 2021-02-26 10:25:30 +01:00
Laurent Destailleur
99a17cadb7 Fix sql syntax 2021-02-26 10:25:08 +01:00
Laurent Destailleur
8e8efce7d1 Fix sql syntax 2021-02-26 10:23:53 +01:00
Laurent Destailleur
9db211b1a7
Merge pull request #16433 from ATM-Consulting/fix/11.0_contact_updateRoles_sql_injection_of_socid 
FIX 11.0 - $this->socid injected in query without checking for empty string
 2021-02-26 10:22:50 +01:00
Laurent Destailleur
563a9bd7ec
Merge pull request #16408 from frederic34/categ_codesyntax 
code syntax categorie collab directory
 2021-02-26 10:22:15 +01:00
Laurent Destailleur
e0cf5468ef
Merge pull request #16409 from frederic34/patch-3 
fix fourn card
 2021-02-26 10:22:04 +01:00
Laurent Destailleur
573ab9f91f
Merge pull request #16410 from frederic34/comm_codesyntax 
code syntax comm directory
 2021-02-26 10:21:48 +01:00
Laurent Destailleur
9b8e8f2571
Merge pull request #16411 from frederic34/commande_codesyntax 
code syntax commande directory
 2021-02-26 10:21:36 +01:00
Laurent Destailleur
ccffa7e2a0
Merge pull request #16412 from frederic34/compta_codesyntax 
code syntax compta directory
 2021-02-26 10:21:22 +01:00
Laurent Destailleur
463dda6d7a
Merge pull request #16413 from frederic34/contact_codesyntax 
code syntax contact directory
 2021-02-26 10:21:01 +01:00
daraelmin
e079ceb9c3
Fix #16420 undefined $model_mail_selected_id 
Set $model_mail_selected_id to 0 when it is undefined
 2021-02-26 08:51:01 +01:00
daraelmin
5d31a93bf0
Fix #16420 - undefined $model_mail_selected_id 
Set $model_mail_selected_id to 0 when it is undefined
 2021-02-26 08:20:51 +01:00
Frédéric FRANCE
ed6d2376f1
code syntax fourn directory 2021-02-25 23:21:30 +01:00
Frédéric FRANCE
fb07484d3f
code syntax fichinter directory 2021-02-25 23:00:32 +01:00
Frédéric FRANCE
d6ffdfe835
code syntax exports externalsite directory 2021-02-25 22:50:40 +01:00
Frédéric FRANCE
8a69fa0d35
code syntax expensereport directory 2021-02-25 22:45:02 +01:00
Frédéric FRANCE
8db4291f88
code syntax expedition directory 2021-02-25 22:38:35 +01:00
Frédéric FRANCE
125c7513da
code syntax ecm emailcollector directories 2021-02-25 22:26:26 +01:00
Frédéric FRANCE
8670cc2d6f
code syntax don directory 2021-02-25 22:18:34 +01:00
Frédéric FRANCE
d97af3f849
code syntax delivery directory 2021-02-25 22:15:04 +01:00
Frédéric FRANCE
ef28a76ad0
code syntax datapolicy dav debugbar directories 2021-02-25 22:09:10 +01:00
Frédéric FRANCE
c11fd091e2
fix translation 2021-02-25 21:18:51 +01:00
Juanjo Menent
e08bfab537 FIX: Bad project filter in ticket list 2021-02-25 16:29:26 +01:00
Christophe Battarel
75298b4ac6 fix for stickler 2021-02-25 16:00:42 +01:00
Christophe Battarel
445974a003 add event management to batch products 2021-02-25 15:47:14 +01:00
Christophe Battarel
a3a8e7c4e4 change hasBatch function 2021-02-25 15:35:45 +01:00
Christophe Battarel
a61fa2b049 differentiate serial numbers from lot management 2021-02-25 15:15:00 +01:00
Florian Mortgat
d59ee06438 FIX 11.0 - $this->socid injected in query without checking for empty value 2021-02-25 14:51:57 +01:00
Francis Appels
0e89dd7344 Also register movement for 0 produced to update cost. 
Use correct movement label for negative consumed.
 2021-02-25 11:23:19 +01:00
abb
e97468c138 new:Fetch region_code in societe fetch 2021-02-25 09:02:19 +01:00
stickler-ci
a31d5e8dc9 Fixing style errors. 2021-02-24 22:32:48 +00:00
dvdwalker
4c321341d4
Fix: Ajax on/off not saving value in DB after updating to version >=12 
The issue seams to be that starting in version 12 the "[element]_UPDATE" trigger is called in file core/ajax/objectonoff.php but some properties that are required on $object are not set.
 2021-02-24 19:28:47 -03:00
josemariagomezroncero
c0a489ec1a
Update ProductCombination.class.php 
Product dont update product variation statut when desactivate for sale.
 2021-02-24 23:16:46 +01:00
dvdwalker
a683acde62
Fix: Ajax on/off not saving value in DB after updating to version >=12 
The issue seams to be that starting in version 12 the "[element]_UPDATE" trigger is called in file core/ajax/objectonoff.php but some properties that are required on $object are not set. Those are (at least for product that is what I use):

$object->id
$object->table_element
$object->fields[$field]

The error occurs on the setValueFrom function in core/class/commonobject.class.php file
 2021-02-24 17:00:10 -03:00
Frédéric FRANCE
aa56a4f739
typo 2021-02-24 18:20:42 +01:00
Nicolas
0c424db506 Correct stickler 2021-02-24 16:03:24 +01:00
Nicolas
589c757fbf Correct stickler 2021-02-24 15:57:33 +01:00
Francis Appels
bca9004f36 Fix displayed unit cost of free consumption line 2021-02-24 15:48:44 +01:00
Nicolas
49c0967a3e NEW option for Takepos to show the total price without tax 2021-02-24 15:48:15 +01:00
Francis Appels
e12db6d1f1 Merge remote-tracking branch 'Dolibarr/develop' into develop_mo_pmp 2021-02-24 15:20:45 +01:00
dvdwalker
3b49792985
Update product.class.php 2021-02-24 10:38:11 -03:00
Laurent Destailleur
f7c119e48c Fix json decode 2021-02-24 13:02:36 +01:00
Laurent Destailleur
22208b622f WIP Add lead 2021-02-24 12:55:24 +01:00
Laurent Destailleur
ebb4f03788 Prepare public page for autocreate contact-lead 2021-02-24 12:19:28 +01:00
Laurent Destailleur
3a0b762a6e Var not defined 2021-02-24 12:01:58 +01:00
Laurent Destailleur
566a0ba785 Code comment 2021-02-24 11:42:55 +01:00
Laurent Destailleur
4f1f17fedc Fix GETPOST instead of POST 2021-02-24 11:37:20 +01:00
Laurent Destailleur
d4a78bf7c6 Removed useless field 2021-02-24 10:24:54 +01:00
Frédéric FRANCE
554e449e40
code syntax core directory 2021-02-23 22:03:23 +01:00
Frédéric FRANCE
2da97c2bac
code syntax contrat directory 2021-02-23 21:24:38 +01:00
Frédéric FRANCE
3b6d01ffae
code syntax contact directory 2021-02-23 21:16:15 +01:00
Frédéric FRANCE
61600a9e65
code syntax compta directory 2021-02-23 21:09:01 +01:00
Frédéric FRANCE
6dfca9f1f5
code syntax commande directory 2021-02-23 20:46:19 +01:00
Frédéric FRANCE
55a5e46527
code syntax comm directory 2021-02-23 20:26:57 +01:00
Frédéric FRANCE
398e820a31
code syntax comm directory 2021-02-23 20:26:22 +01:00
Frédéric FRANCE
faabec4edc
code syntax comm directory 2021-02-23 20:25:33 +01:00
Frédéric FRANCE
f19bbb89f3
code syntax comm directory 2021-02-23 20:24:49 +01:00
Frédéric FRANCE
8fe1eac48b
code syntax comm directory 2021-02-23 20:23:21 +01:00
Frédéric FRANCE
52ae7d79ae
code syntax comm directory 2021-02-23 20:22:36 +01:00
Frédéric FRANCE
5931051c88
code syntax comm directory 2021-02-23 18:59:19 +01:00
Frédéric FRANCE
464e4442b1
fix fourn card 2021-02-23 18:23:14 +01:00
Frédéric FRANCE
6fcb7a96a1
code syntax categorie collab directory 2021-02-23 18:04:37 +01:00
Frédéric FRANCE
70446fe28e
code syntax cashdesk directory 2021-02-23 17:58:31 +01:00
Frédéric FRANCE
3c8089af0d
code syntax bom directory 2021-02-23 17:51:46 +01:00
Frédéric FRANCE
9b48e1a649
code syntax api directory 2021-02-23 17:44:43 +01:00