lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
97,826 Commits 43 Branches 150 Tags 886 MiB
358bb87ae2
Commit Graph

97826 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Laurent Destailleur
358bb87ae2 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/comm/action/index.php
	htdocs/core/class/html.form.class.php
	htdocs/core/lib/payments.lib.php
	htdocs/core/modules/commande/doc/pdf_einstein.modules.php
	htdocs/core/modules/commande/doc/pdf_eratosthene.modules.php
	htdocs/core/modules/facture/doc/pdf_crabe.modules.php
	htdocs/core/modules/facture/doc/pdf_sponge.modules.php
	htdocs/core/modules/propale/doc/pdf_azur.modules.php
	htdocs/core/modules/propale/doc/pdf_cyan.modules.php
	htdocs/projet/card.php
	htdocs/public/payment/newpayment.php
	htdocs/societe/list.php
	htdocs/ticket/document.php
 2021-04-13 20:19:05 +02:00
Laurent Destailleur
fe57ba2116 Fix phpcs 2021-04-13 20:00:36 +02:00
Laurent Destailleur
f54fd1063b Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-04-13 19:39:08 +02:00
Laurent Destailleur
c93f88e47a Debug mass action after regression on close on proposal 2021-04-13 19:38:55 +02:00
Laurent Destailleur
192fcb89d2
Merge pull request #17097 from NextGestion/dolibarr_partnership 
Create Partnership Module
 2021-04-13 16:33:54 +02:00
Laurent Destailleur
ce18d416e6
Merge pull request #17222 from aspangaro/13p31 
FIX Write right on document
 2021-04-13 16:18:48 +02:00
Laurent Destailleur
d09be1f86f Do not make new twice 2021-04-13 16:18:18 +02:00
Laurent Destailleur
58e87d935f
Merge pull request #17215 from aspangaro/14a36 
Work on split module fournisseur
 2021-04-13 16:06:26 +02:00
Laurent Destailleur
8c9cacba4d
Merge branch 'develop' into 14a36 2021-04-13 16:05:57 +02:00
Laurent Destailleur
4edf710594
Merge pull request #17220 from dolibit-ut/patch-263 
Update llx_10_c_regions.sql
 2021-04-13 15:58:43 +02:00
Laurent Destailleur
93f21303d4
Merge pull request #17247 from bb2a/filter_warehouse 
New add filter warehouse propal
 2021-04-13 15:58:19 +02:00
Laurent Destailleur
add6853581
Merge branch 'develop' into filter_warehouse 2021-04-13 15:58:13 +02:00
Laurent Destailleur
8aeed353c7
Merge pull request #17232 from dolibit-ut/patch-270 
Update eventorganizationindex.php
 2021-04-13 15:56:24 +02:00
Laurent Destailleur
da400ee17e
Merge pull request #17235 from dolibit-ut/patch-273 
Update myobject_agenda.php
 2021-04-13 15:56:06 +02:00
Laurent Destailleur
946a93dcd9
Update myobject_agenda.php 2021-04-13 15:55:50 +02:00
Laurent Destailleur
f99d4897a0
Merge pull request #17230 from dolibit-ut/patch-268 
Update mo_card.php
 2021-04-13 15:53:54 +02:00
Laurent Destailleur
91b8ccafbb Fix empty label 2021-04-13 15:53:05 +02:00
Laurent Destailleur
4ad14a1f65 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-04-13 15:51:47 +02:00
Laurent Destailleur
97336ad417 Fix label of empty value in select of warehouse 2021-04-13 15:51:34 +02:00
Laurent Destailleur
302dd3e43d
Merge pull request #17238 from dolibit-ut/patch-275 
Update agenda.php
 2021-04-13 15:41:35 +02:00
Laurent Destailleur
adbebac0fc
Merge pull request #17243 from frederic34/patch-3 
fix MAIN_ADD_PDF_BACKGROUND
 2021-04-13 15:41:20 +02:00
Laurent Destailleur
6b542a89f6
Merge pull request #17245 from Robin-Yann/13-fix-project-visibility-field 
FIX: project visibility field with two option
 2021-04-13 15:40:04 +02:00
Laurent Destailleur
ee07796131
Update card.php 2021-04-13 15:39:34 +02:00
Laurent Destailleur
de73c0adb2
Update card.php 2021-04-13 15:38:51 +02:00
Laurent Destailleur
4bbe02c209
Merge pull request #17223 from atm-gauthier/fix_migration_script 
FIX : UPDATE query must not use alias for postgres compatibility
 2021-04-13 15:37:42 +02:00
Laurent Destailleur
3f159fa39f
Merge pull request #17251 from DorianVabre/dev_EventOrganizer 
Dev event organizer: public registration page to a conference
 2021-04-13 15:31:40 +02:00
Anthony Berton
5fec4c346e Update index.php 2021-04-13 15:28:16 +02:00
Laurent Destailleur
0efe49e461
Merge pull request #17249 from Robin-Yann/13-fix-missing_param_settings 
FIX missing parameter in select for POP
 2021-04-13 15:19:14 +02:00
Laurent Destailleur
b8f5b4e84f
Merge pull request #17253 from bb2a/bug_product_index.php 
Update index.php
 2021-04-13 15:17:46 +02:00
Anthony Berton
68e46515a4 Update index.php 2021-04-13 13:54:37 +02:00
Anthony Berton
1b2f78ca06 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into filter_warehouse 2021-04-13 13:07:58 +02:00
Anthony Berton
69d489c12b Update list.php 2021-04-13 13:00:44 +02:00
Laurent Destailleur
15d8a4af73
Merge pull request #17227 from dolibit-ut/patch-265 
Update member_emails.php
 2021-04-13 12:12:05 +02:00
Laurent Destailleur
e62c234c84
Merge pull request #17231 from dolibit-ut/patch-269 
Update recruitmentcandidature_agenda.php
 2021-04-13 12:11:39 +02:00
Laurent Destailleur
facfb5d305
Merge pull request #17237 from dolibit-ut/patch-274 
Update agenda.php
 2021-04-13 12:10:52 +02:00
Laurent Destailleur
bcaf251c53
Merge pull request #17239 from dolibit-ut/patch-276 
Create .htaccess
 2021-04-13 12:10:27 +02:00
Dorian Vabre
0c6431efd5 Merge branch 'dev_EventOrganizer' of github.com:DorianVabre/dolibarr into dev_EventOrganizer 2021-04-13 12:10:15 +02:00
Dorian Vabre
3c265b2a5b fixing style error 2021-04-13 12:09:53 +02:00
Laurent Destailleur
6b5091bb4a
Merge pull request #17244 from Robin-Yann/fix_13_addmissinghook 
fix: add missing hook
 2021-04-13 12:09:38 +02:00
Laurent Destailleur
8aecf24294
Merge pull request #17233 from dolibit-ut/patch-271 
Update mo_agenda.php
 2021-04-13 12:08:46 +02:00
Laurent Destailleur
bafdb00ea0
Update mo_agenda.php 2021-04-13 12:08:25 +02:00
Laurent Destailleur
91c55e1c91
Merge pull request #17229 from dolibit-ut/patch-267 
Update bom_card.php
 2021-04-13 12:07:47 +02:00
Laurent Destailleur
f177d91456
Merge pull request #17226 from dolibit-ut/patch-264 
Update member_type_extrafields.php
 2021-04-13 12:07:18 +02:00
stickler-ci
839edb5abe Fixing style errors. 2021-04-13 10:06:42 +00:00
Laurent Destailleur
1be53379aa
Merge pull request #17228 from dolibit-ut/patch-266 
Update bom_note.php
 2021-04-13 12:06:41 +02:00
Laurent Destailleur
9e4f73306b
Merge pull request #17234 from dolibit-ut/patch-272 
Delete index.html
 2021-04-13 12:05:57 +02:00
Laurent Destailleur
41dc69e05a
Merge pull request #17250 from Robin-Yann/fix-societe-list-fournisseur 
FIX: mask selector fournisseur if module not activate
 2021-04-13 12:05:31 +02:00
Dorian Vabre
14e64f4a33 security changes: encryption is now with instead of hard coded keys 2021-04-13 11:57:36 +02:00
Laurent Destailleur
1bae707246 Prepare table for future enhancement 2021-04-13 11:38:37 +02:00
Dorian Vabre
149aa8e81b email is now used as name, if name is empty 2021-04-13 11:31:22 +02:00