lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
99,333 Commits 43 Branches 150 Tags 886 MiB
0121150e02
Commit Graph

99333 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Laurent Destailleur
0121150e02
Merge pull request #17631 from fappels/14_reception 
Fix: Add test to delete supplier order if reception exist
 2021-05-17 13:22:34 +02:00
Francis Appels
c3bea1b46e Fix: Add test to delete supplier order if reception exist 2021-05-17 12:00:56 +02:00
Laurent Destailleur
1b25c4daa0 Fix phpcs 2021-05-17 11:29:51 +02:00
Laurent Destailleur
f25c57b1f6 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-05-17 11:26:43 +02:00
Laurent Destailleur
6402ef9496 Fix colors 2021-05-17 11:26:31 +02:00
Laurent Destailleur
082ae2e627 Fix trans 2021-05-17 11:11:17 +02:00
Laurent Destailleur
35c27b8eb8
Merge pull request #17588 from frederic34/completeTabHead 
add sample completeTabHead for template modulebuilder
 2021-05-17 10:29:51 +02:00
Laurent Destailleur
d0c634a99c
Merge pull request #17489 from Hystepik/develop#1 
Fix  #17475 : Add of List-Unsubscribe in mass emailing
 2021-05-17 10:23:21 +02:00
Laurent Destailleur
21896370a6
Merge pull request #17528 from bb2a/phone_head_document 
Add phone and address in popup Thirdparty info
 2021-05-17 10:16:49 +02:00
Laurent Destailleur
261414cb7f
Update societe.class.php 2021-05-17 10:16:33 +02:00
Laurent Destailleur
1093e66d26
Update societe.class.php 2021-05-17 10:14:14 +02:00
Laurent Destailleur
d0c6afbe50
Merge pull request #17529 from Hystepik/develo#2 
Fix Dolibarr#17477 : Sql error in invoices cards
 2021-05-17 10:10:49 +02:00
Laurent Destailleur
a29f997fcd
Merge branch 'develop' into develo#2 2021-05-17 10:10:41 +02:00
Laurent Destailleur
296c1c2978
Merge pull request #17583 from AisukoWasTaken/develop 
Fix SQL error for Panama Provinces
 2021-05-17 10:09:15 +02:00
Laurent Destailleur
0c2fe04557
Merge pull request #17590 from dolibit-ut/patch-322 
Update countries_iso-3166_en.txt
 2021-05-17 10:08:20 +02:00
Laurent Destailleur
ca5a2a23c9
Merge pull request #17591 from dolibit-ut/patch-323 
Update vat_number_names.txt
 2021-05-17 10:08:03 +02:00
Laurent Destailleur
979b66177d
Merge pull request #17589 from dolibit-ut/patch-321 
Update llx_00_c_country.sql
 2021-05-17 10:07:23 +02:00
Laurent Destailleur
4ea471a0e8
Merge pull request #17595 from dolibit-ut/patch-326 
Update countries_iso-3166_fr.txt
 2021-05-17 10:05:07 +02:00
Laurent Destailleur
31c68cc9f0
Merge pull request #17592 from dolibit-ut/patch-324 
Update world_tax_rates.txt
 2021-05-17 10:04:42 +02:00
Laurent Destailleur
80456db2a9
Merge pull request #17594 from dolibit-ut/patch-325 
Update code_nace.txt
 2021-05-17 09:56:34 +02:00
Laurent Destailleur
72eda2017a
Merge pull request #17596 from dolibit-ut/patch-327 
Update address_format.txt
 2021-05-17 09:56:12 +02:00
Laurent Destailleur
ce47cf4cf6
Merge pull request #17598 from dolibit-ut/patch-329 
Update text.txt
 2021-05-17 09:55:34 +02:00
Laurent Destailleur
6217d83846
Merge pull request #17599 from fbagnol/develop 
Add soc in categories contacts list
 2021-05-17 09:54:26 +02:00
Laurent Destailleur
f95f0748e3
Update viewcat.php 2021-05-17 09:54:04 +02:00
Laurent Destailleur
d3d187cc05
Merge pull request #17600 from Dolibarr/snyk-fix-53716a71864112b86bf16287ce335b0c 
[Snyk] Security upgrade zapier-platform-core from 10.1.2 to 11.0.0
 2021-05-17 09:48:56 +02:00
Laurent Destailleur
aa780eb00b
Merge pull request #17597 from dolibit-ut/patch-328 
Update locales.txt
 2021-05-17 09:47:34 +02:00
Laurent Destailleur
c013a22008 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-05-17 09:20:40 +02:00
Laurent Destailleur
608e4e8891
Merge pull request #17601 from ptibogxiv/patch-426 
NEW report contact/adresses on credit note from invoice
 2021-05-17 09:12:12 +02:00
Laurent Destailleur
847e4ae4d7
Merge pull request #17616 from piernov/11.0-fix-LDAPposixAccount 
Fix LDAP synchronisation for User class when using posixAccount objectclass
 2021-05-17 09:08:50 +02:00
Laurent Destailleur
6a9fa11539
Merge branch 'develop' into 11.0-fix-LDAPposixAccount 2021-05-17 09:07:30 +02:00
Laurent Destailleur
8dc6241aee Clean dead code 2021-05-17 08:58:02 +02:00
Laurent Destailleur
ac95302fa7 Clean comment 2021-05-17 08:48:02 +02:00
Laurent Destailleur
242db33311
Merge pull request #17620 from atm-maxime/fix/hrm 
Fix quick create dropdown + translations
 2021-05-17 08:31:54 +02:00
stickler-ci
67fc5bce5f Fixing style errors. 2021-05-17 06:30:30 +00:00
Laurent Destailleur
6308c17c5f
Update main.inc.php 2021-05-17 08:30:12 +02:00
Laurent Destailleur
4768729c09 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/comm/propal/list.php
	htdocs/commande/list.php
	htdocs/compta/facture/list.php
	htdocs/core/class/rssparser.class.php
	htdocs/core/tpl/admin_extrafields_view.tpl.php
	htdocs/core/tpl/extrafields_list_search_sql.tpl.php
	htdocs/expedition/list.php
 2021-05-17 07:57:32 +02:00
Laurent Destailleur
ea78462167 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 2021-05-17 07:33:37 +02:00
Laurent Destailleur
2f2ba933f8 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/core/tpl/admin_extrafields_view.tpl.php
	htdocs/user/class/usergroup.class.php
 2021-05-17 07:33:28 +02:00
Laurent Destailleur
b8b2928dd1 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2021-05-17 07:29:30 +02:00
Laurent Destailleur
5a15dbf545 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 
Conflicts:
	htdocs/user/class/usergroup.class.php
 2021-05-17 07:29:19 +02:00
Laurent Destailleur
17b08cc22f Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-05-17 07:27:13 +02:00
Laurent Destailleur
6bf66adff0 Fix remove some $_REQUEST 2021-05-17 07:27:02 +02:00
Laurent Destailleur
6236721067
Merge pull request #17607 from fappels/14_selectwarehouses 
fix implode on string for formproduct loadwarehouse
 2021-05-17 07:20:15 +02:00
Laurent Destailleur
84ae2a2f91
Merge pull request #17624 from atm-maxime/patch-2 
Update box_dolibarr_state_board.php
 2021-05-17 07:15:50 +02:00
Laurent Destailleur
6a2afabcac
Merge pull request #17617 from piernov/11.0-fix-LDAPposixGroupId 
Fix: properly set gid for Group LDAP synchro
 2021-05-17 07:14:25 +02:00
Laurent Destailleur
eec54a5c9d
Merge pull request #17609 from fmarcet/13.0 
FIX: Filter of the dates in the lists is lost
 2021-05-17 07:13:14 +02:00
Laurent Destailleur
88cdda2b8a
Merge pull request #17612 from frederic34/patch-3 
avoid sql error with sql_mode=only_full_group_by
 2021-05-17 07:12:11 +02:00
Laurent Destailleur
ad64b43e30
Update html.form.class.php 2021-05-17 07:11:41 +02:00
Laurent Destailleur
fc22565532
Merge pull request #17613 from atm-maxime/fix/date_propal 
Fix use of DatePropal instead of Date
 2021-05-17 07:09:35 +02:00
Laurent Destailleur
3428c1f165
Merge pull request #17619 from atm-maxime/fix/usergroup_entity 
Fix entity was set to 0 on group creation (HOT FIX)
 2021-05-17 07:09:11 +02:00