Commit Graph

104788 Commits

Author SHA1 Message Date
Laurent Destailleur
749ea1a922 Trans 2021-11-19 23:21:44 +01:00
Laurent Destailleur
48d7378282 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	ChangeLog
	htdocs/comm/action/card.php
	htdocs/core/lib/functions.lib.php
	htdocs/filefunc.inc.php
	htdocs/fourn/class/fournisseur.commande.class.php
	htdocs/langs/ar_IQ/bills.lang
	htdocs/langs/ar_IQ/cashdesk.lang
	htdocs/langs/ar_IQ/modulebuilder.lang
	htdocs/langs/ar_IQ/partnership.lang
	htdocs/langs/ar_IQ/propal.lang
	htdocs/langs/ar_IQ/stocks.lang
	htdocs/langs/ar_IQ/ticket.lang
	htdocs/langs/en_AE/admin.lang
	htdocs/langs/en_US/receptions.lang
	htdocs/langs/en_ZA/admin.lang
	htdocs/product/stock/class/mouvementstock.class.php
	htdocs/reception/class/reception.class.php
2021-11-19 23:14:39 +01:00
Laurent Destailleur
c79fa4d3d0 NEW Add workflow action close purchase order on reception validation
NEW Add workflow action close purchase order on reception closing
2021-11-19 23:03:12 +01:00
Laurent Destailleur
071042b449 Code comment 2021-11-19 22:28:35 +01:00
Laurent Destailleur
635e9e9747 CSS 2021-11-19 22:28:20 +01:00
Laurent Destailleur
3dbab22060 Prepare 14.0.4 2021-11-19 18:08:49 +01:00
Laurent Destailleur
35b1868693 FIX Missing trans 2021-11-19 14:01:31 +01:00
Laurent Destailleur
bb6440af9d FIX Better label for reception status 2021-11-19 13:46:30 +01:00
Laurent Destailleur
cdc160b9a9 FIX column alignement on valid confirm page of shipment 2021-11-19 11:12:53 +01:00
Laurent Destailleur
ec2067df7d Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 2021-11-19 10:06:46 +01:00
Laurent Destailleur
271f42e761 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0
Conflicts:
	htdocs/expedition/class/expedition.class.php
	htdocs/fourn/class/fournisseur.facture.class.php
	htdocs/societe/list.php
2021-11-19 10:06:35 +01:00
Laurent Destailleur
e7a4f04da4 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
Conflicts:
	htdocs/expedition/class/expedition.class.php
	htdocs/fourn/class/fournisseur.commande.class.php
	htdocs/fourn/class/fournisseur.facture.class.php
2021-11-18 21:41:12 +01:00
Laurent Destailleur
92b0fde4ca Debug v15 2021-11-18 21:37:33 +01:00
Laurent Destailleur
2afe6ccb4b Debug feature shown/hide canceled orders 2021-11-18 21:26:35 +01:00
Laurent Destailleur
c6463c9a83
Merge pull request #19166 from polkiko/canceled_orders
NEW Canceled purchase orders do not qualify for total and are hidden
2021-11-18 20:56:42 +01:00
Laurent Destailleur
53de97a52f
Merge pull request #19191 from moreauftheobald/develop
NEW|New Ajout d'un collecteur de pièce jointes a Email collecto
2021-11-18 20:36:28 +01:00
Laurent Destailleur
f525045c44
Merge pull request #19281 from aspangaro/15a29
NEW Thirdparty - Add advanced right to add / edit payment information
2021-11-18 20:32:55 +01:00
Laurent Destailleur
ba7a781c32
Merge pull request #19380 from atm-gauthier/NEW/accountancy_massaction_preselect_account_productaccount_page
NEW : accountancy massaction preselect account (productaccount page)
2021-11-18 20:30:07 +01:00
Laurent Destailleur
efb9d184e4
Merge pull request #19382 from OPEN-DSI/fix-societe-list-region-filter
FIX filter on region in company list
2021-11-18 20:29:36 +01:00
Laurent Destailleur
d6622b3669
Merge pull request #19386 from frederic34/patch-1
fix warning
2021-11-18 20:29:00 +01:00
Laurent Destailleur
242eaa9394
Merge pull request #19387 from FHenry/14.0_fix_list_contact
FIX : contact not in list (contact/list) if module mailing not active and contact has no email
2021-11-18 20:28:43 +01:00
Laurent Destailleur
4caeddf7f8
Merge pull request #19388 from FHenry/14.0_fix_preselecttask_on_event_creation
FIX: preselect task on create event from task
2021-11-18 20:25:03 +01:00
Laurent Destailleur
4d78f8fdc2
Merge pull request #19415 from OPEN-DSI/new-compta-paiement-form-confirm
NEW add form confirm hook in paiement card
2021-11-18 20:24:36 +01:00
Laurent Destailleur
72acd3ac55
Merge pull request #19370 from ptibogxiv/patch-453
ADD new stripe provider in dictionnary
2021-11-18 20:13:05 +01:00
Laurent Destailleur
9789ae23d7
Update llx_c_paiement.sql 2021-11-18 20:12:46 +01:00
Laurent Destailleur
2fef57b31f
Merge branch 'develop' into patch-453 2021-11-18 20:12:10 +01:00
Laurent Destailleur
44d4ab6f9c
Merge pull request #19384 from fmarcet/12.0
Fix: Bad date conversion
2021-11-18 20:10:50 +01:00
Laurent Destailleur
8f96383186
Update expedition.class.php 2021-11-18 20:10:04 +01:00
Laurent Destailleur
8b1c45d0fe
Merge pull request #19413 from FHenry/dev_add_hook_marginDisplay
new: add hook for displayMarginInfos
2021-11-18 20:05:32 +01:00
Laurent Destailleur
07004e21ed
Merge pull request #19401 from altairisfr/autocontact
add author as contact
2021-11-18 20:02:59 +01:00
Laurent Destailleur
f040e7e456
Merge pull request #19398 from grandoc/new_branch_17_11_2021
fix bad path
2021-11-18 20:01:43 +01:00
Laurent Destailleur
e81c118a27 FIX Use the SQL standard for the if confition 2021-11-18 19:38:56 +01:00
Laurent Destailleur
d24120d6f9 Clean code 2021-11-18 19:27:40 +01:00
Laurent Destailleur
0649dc598d Clean code 2021-11-18 19:25:07 +01:00
Laurent Destailleur
8477c0a3f1
Merge pull request #17998 from OPEN-DSI/fix_00008
FIX: Reload values of the specified entity when change entity in the execution of cron jobs
2021-11-18 18:41:06 +01:00
Ferran Marcet
db975bbcc2 Fix: The error not correctly collected on insertation line failure 2021-11-18 17:17:00 +01:00
Laurent Destailleur
2a39a1dc93 Keep option to enable field 2021-11-18 13:55:55 +01:00
Laurent Destailleur
e609622f2b Fix test on verifCond for value 0 2021-11-18 13:17:48 +01:00
Laurent Destailleur
2d4f971508 Fix verifCond must return false if string is '0'
Hide a not used property.
2021-11-18 13:10:52 +01:00
Laurent Destailleur
e652b93878 Autoswitch on inventory tab on validation of inventory
Fix disabled button when some data are available.
2021-11-18 12:58:31 +01:00
lvessiller
cdde6ecf94 NEW add form confirm hook in paiement card 2021-11-18 12:17:02 +01:00
lvessiller
ef447bacbf NEW add form confirm hook in paiement card 2021-11-18 12:12:30 +01:00
Florian HENRY
0f402897a4 add add_replace 2021-11-18 10:55:05 +01:00
Florian HENRY
d48df1d2c3 new: add hook for displayMarginInfos 2021-11-18 10:50:03 +01:00
Laurent Destailleur
9b9b63c794 Prepare database for future 2021-11-18 10:20:05 +01:00
Laurent Destailleur
0c9fb16a36 Fix trans 2021-11-18 09:55:36 +01:00
Laurent Destailleur
0294f3dc34 Missing trans 2021-11-18 09:54:48 +01:00
Laurent Destailleur
0e57f62d02 Prepare 14.0.3 2021-11-17 19:03:25 +01:00
Christophe Battarel
0afbff5d67 put code after good id 2021-11-17 16:52:04 +01:00
Laurent Destailleur
5fa50afc13 Responsive 2021-11-17 12:24:13 +01:00