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

94043 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Laurent Destailleur
dd69aed27b Fix error test 2021-01-23 17:49:08 +01:00
Laurent Destailleur
6d0cbd3ee5 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-01-23 17:32:49 +01:00
Laurent Destailleur
f2c4e25827 Clean code 2021-01-23 17:32:14 +01:00
Laurent Destailleur
21e55d1542 NEW Can filter files in GED on status Shared/Not shared 2021-01-23 13:56:51 +01:00
Laurent Destailleur
8bd7ddee6b Clean code 2021-01-23 13:55:56 +01:00
Laurent Destailleur
791f5f3f62 Fix css 2021-01-23 13:50:06 +01:00
Laurent Destailleur
7e8d06e8b8 Fix update default contact type 2021-01-22 14:10:08 +01:00
Laurent Destailleur
599d69b07c Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-01-22 13:40:08 +01:00
Laurent Destailleur
e1b6f33894 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/contact/card.php
	htdocs/contact/class/contact.class.php
	htdocs/langs/fr_FR/stocks.lang
	htdocs/modulebuilder/template/myobject_list.php
 2021-01-22 13:40:00 +01:00
Laurent Destailleur
d23e6646ed
Merge pull request #16030 from atm-adrien/FIX/Linked_extrafields_10.0 
FIX : Linked extrafields lists
 2021-01-22 13:35:56 +01:00
Laurent Destailleur
93ca27d808 FIX #16041 2021-01-22 13:17:27 +01:00
Laurent Destailleur
ad2f5ea7c1 Update website template 2021-01-22 12:39:59 +01:00
Laurent Destailleur
242a0a54be Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 2021-01-22 10:52:07 +01:00
Laurent Destailleur
cf11f356e8 Fix load of data are not complete 2021-01-22 10:51:47 +01:00
Laurent Destailleur
641e2d9906
Merge pull request #16042 from aspangaro/13a29 
Accountancy - Gestimum v3 / v5 Added a sort to excluse line at zero
 2021-01-22 02:20:16 +01:00
Laurent Destailleur
5cd80015db
Merge pull request #16044 from frederic34/supplier_proposal_extrafields_keys 
add missing index in extrafields tables of supplier proposal
 2021-01-22 02:10:29 +01:00
Laurent Destailleur
d368b3c7d6
Merge pull request #16046 from atm-john/new/manifest_use_squared_img 
NEW : manifest use squared image or custom
 2021-01-22 02:05:35 +01:00
Laurent Destailleur
79fb672674 Sync transifex 2021-01-22 01:47:29 +01:00
Laurent Destailleur
b25f65c995 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/projet/info.php
 2021-01-22 01:09:35 +01:00
Laurent Destailleur
5aba1f9ccd FIX missing socid into link to create event from project agenda tab 2021-01-22 01:07:45 +01:00
stickler-ci
bb09a39ce6 Fixing style errors. 2021-01-21 20:52:21 +00:00
ATM john
04dc3ae8cd NEW : manifest use squared image or custom 2021-01-21 21:46:00 +01:00
Frédéric FRANCE
c77c5628ca
add another missing undex 2021-01-21 21:35:30 +01:00
Frédéric FRANCE
7888b3d33e
add missing index in extrafields tables of supplier proposal 2021-01-21 21:19:03 +01:00
Alexandre SPANGARO
939f27deed Accountancy - Gestimum v3 / v5 Added a sort to excluse line at zero 2021-01-21 20:55:46 +01:00
Laurent Destailleur
8076d47b8a FIX #15980 2021-01-21 19:08:03 +01:00
Laurent Destailleur
7982cab526 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/core/modules/contract/doc/pdf_strato.modules.php
	htdocs/ticket/card.php
 2021-01-21 18:34:55 +01:00
Laurent Destailleur
0e684abceb
Merge pull request #16039 from ATM-Consulting/fix/12.0_ticket_extrafields_of_type_date_are_not_saved 
FIX 12.0 - ticket extrafields of type 'date' are not saved
 2021-01-21 18:27:36 +01:00
Laurent Destailleur
0f7bdef1c1 FIX in pages of balances 2021-01-21 18:02:17 +01:00
BlackMirror
a55d23f363 [FM] FIX - ticket extrafields of type 'date' are not saved 2021-01-21 15:55:52 +01:00
Laurent Destailleur
039cb0685b Fix default filter 2021-01-21 14:43:57 +01:00
Laurent Destailleur
ddc163e79e
Merge pull request #16025 from FHenry/dev_fix_createcontactmailmandatory 
fix bulk email mandatory only if contact creation is ask
 2021-01-21 14:07:13 +01:00
Laurent Destailleur
c3ad443200 Fix var not defined 2021-01-21 13:52:23 +01:00
Laurent Destailleur
69479584ed Fix $ok is not used 2021-01-21 13:50:31 +01:00
Laurent Destailleur
8eee4a79e7
Merge pull request #16032 from frederic34/patch-1 
fix colspan too small
 2021-01-21 13:34:41 +01:00
Laurent Destailleur
8e5b971c49
Merge pull request #15918 from zuiko/patch-1 
Fix #15633: Product creation: EAN13 barcode automatic generation incompatible with EAN13 existing barcode scanning, unusable function.
 2021-01-21 13:33:47 +01:00
Laurent Destailleur
12b3b72fe3
Merge pull request #16028 from ATM-Consulting/fix/12.0_pdf_strato_label_instead_of_ref 
[FM] Fix 12.0 - duplicate label, probably mistaken for ref
 2021-01-21 13:25:54 +01:00
Laurent Destailleur
bacf625291
Merge pull request #16026 from frederic34/getfather 
add status and status_buy
 2021-01-21 13:24:53 +01:00
Laurent Destailleur
f160246272
Merge pull request #16031 from frederic34/commtpl 
add more infos in link
 2021-01-21 13:24:17 +01:00
Laurent Destailleur
b0ea2ac187
Merge pull request #16033 from FHenry/12_fix_position_coutry_resource 
move extrafield to the end as other card
 2021-01-21 13:22:04 +01:00
Laurent Destailleur
af438624a6
Update commonobject.class.php 2021-01-21 13:21:22 +01:00
Laurent Destailleur
0a55ba32f8
Merge branch 'develop' into FIX/Linked_extrafields_10.0 2021-01-21 13:20:34 +01:00
Laurent Destailleur
5aebf18dce
Merge pull request #16037 from bb2a/bug_migration_drop_foreignkey 
Update 13.0.0-14.0.0.sql
 2021-01-21 13:14:33 +01:00
Laurent Destailleur
cfa593def1 Fix must be foreign key name, not field name. 2021-01-21 13:13:59 +01:00
Laurent Destailleur
437ca1d357
Merge pull request #16038 from Hystepik/develop#3 
Fix #16036 Mysql syntax error 13.0.0-14.0.0
 2021-01-21 13:12:24 +01:00
Laurent Destailleur
d1af419d02 More log to debug payment errors 2021-01-21 11:50:15 +01:00
lmarcouiller
3ab773c510 Fix #16036 Mysql syntax error 2021-01-21 10:51:14 +01:00
Anthony Berton
7be25260f3 Update 13.0.0-14.0.0.sql 2021-01-21 10:35:06 +01:00
Florian HENRY
2a19528267 move extrafield to the end as other acard 2021-01-21 08:52:10 +01:00
Frédéric FRANCE
01e41a8ddd
fix colspan too small 2021-01-20 22:40:40 +01:00