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

109158 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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 Magnin
c8c6d5c1d2
Update functions.lib.php 2021-11-19 17:09:51 +01:00
Laurent Magnin
5f40c2e9dd
Update functions.lib.php 2021-11-19 17:08:07 +01:00
Laurent Magnin
00c7114c0b
Merge branch 'Dolibarr:develop' into fix_ticket_substitution 2021-11-19 16:52:57 +01:00
Martin Neubauer
4fcac5b53c Fix check for non-custom modules 
The check turned out to be true even for custom modules, causing
the copying of the language file to fail. This attempts to bring
the code behaviour in line with the code explaining it.
 2021-11-19 16:38:41 +01:00
Marc de Lima Lucio
bffd2fc939 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop_NEW_block_leave_if_negative_balance 2021-11-19 16:12:33 +01:00
Marc de Lima Lucio
ffa88b803f FIX: project timesheet by week: cleanup unused code 2021-11-19 16:03:41 +01:00
Marc de Lima Lucio
1129222064 FIX: user employee tab: offset in open days messes up holiday length calculation 2021-11-19 15:59:34 +01:00
Marc de Lima Lucio
c5f0faad43 FIX: project timesheet: public holidays offset by 1 day 2021-11-19 15:36:00 +01:00
Marc de Lima Lucio
7cb657c991 FIX: project timesheets: assume Saturday and Sunday are default weekend days when working days conf is empty or badly formed 2021-11-19 14:49:11 +01:00
lmarcouiller
00369a5269 fix errors 2021-11-19 14:32:40 +01:00
Florian HENRY
c90082925c fix 2021-11-19 14:30:33 +01:00
Florian HENRY
9685081967 Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_new_enhance_trad_select_dictionnary 2021-11-19 14:27:46 +01:00
Florian HENRY
be44e5b0ca NEW: for developper select_dictionnry can now deal with label translated 2021-11-19 14:27:29 +01:00
Hystepik
63773bf36d
Merge branch 'develop' into develop#4 2021-11-19 14:22:39 +01:00
lmarcouiller
d1f5cb9184 Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop#5 2021-11-19 14:01:52 +01:00
lmarcouiller
3bcafb548a fix errors 2021-11-19 14:01:37 +01:00
Laurent Destailleur
35b1868693 FIX Missing trans 2021-11-19 14:01:31 +01:00
lmarcouiller
5b1028611a update inventory 19 11 2021-11-19 13:55:59 +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
Adrien Raze
dc23c7f6a3 FIX : Travis 2021-11-19 10:29:27 +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
stickler-ci
c5f6c617c9 Fixing style errors. 2021-11-19 08:34:45 +00:00
Adrien Raze
958be422e2 Merge branch '14.0' of github.com:Dolibarr/dolibarr into FIX_commandeFourn_Stats 2021-11-19 09:26:48 +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
Florian HENRY
0e8e8a79dc review code 2021-11-18 21:12:43 +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