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

88058 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Laurent Destailleur
f5d7e94d7e NEW Add a stat page to list popularity of products on invoices 
Merge duplicate pages into 1.
 2020-07-30 19:32:06 +02:00
Laurent Destailleur
05531f95d6 Fix phpcs 2020-07-30 14:03:01 +02:00
Laurent Destailleur
2ff6791e53 css 2020-07-30 04:23:23 +02:00
Laurent Destailleur
4ed1da1632 Work on recruitment module 2020-07-30 04:17:05 +02:00
Laurent Destailleur
f937f5beea Work on recruitment module 2020-07-30 04:06:27 +02:00
Laurent Destailleur
c79d617a50 Add public page of job position offers 2020-07-30 03:50:27 +02:00
Laurent Destailleur
3e586d3b26
Merge pull request #14285 from RomainDeschamps/patch-7 
NEW add costprice in fields of products list
 2020-07-29 13:57:17 +02:00
Laurent Destailleur
2687666579 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-07-29 13:54:12 +02:00
Laurent Destailleur
8045cff888 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 
Conflicts:
	htdocs/expedition/class/expedition.class.php
 2020-07-29 13:53:09 +02:00
Laurent Destailleur
930ae84dac Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 
Conflicts:
	htdocs/contact/list.php
	htdocs/core/lib/pdf.lib.php
 2020-07-29 13:50:31 +02:00
Laurent Destailleur
ab4b1b1f29 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2020-07-29 13:48:18 +02:00
Laurent Destailleur
4a291f181f Fix regression 2020-07-29 13:47:04 +02:00
Laurent Destailleur
c93a4c7fc0 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2020-07-29 13:40:27 +02:00
Laurent Destailleur
566f683c54 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2020-07-29 13:40:19 +02:00
Romain DESCHAMPS
eaef99b7af second approval back in stable feature as is the setting for minimum amount 2020-07-29 13:39:38 +02:00
Laurent Destailleur
9e85abc8c1
Merge pull request #14286 from RomainDeschamps/patch-1 
second approval back in stable feature as is the setting for minimum …
 2020-07-29 13:38:58 +02:00
Laurent Destailleur
f2390e85b9
Merge pull request #14287 from atm-florianm/FIX_allow_more_html_tags 
NEW: additional html tags allowed by dol_string_onlythesehtmltags()
 2020-07-29 13:34:45 +02:00
Laurent Destailleur
9bef1ef6dd
Merge pull request #14298 from bafbes/abb110230 
fetch product model_pdf field
 2020-07-29 13:19:09 +02:00
Laurent Destailleur
1d686a0d4c
Update product.class.php 2020-07-29 13:18:49 +02:00
Laurent Destailleur
454a804b4e
Merge pull request #14299 from atm-gauthier/9.0_hidden_unit 
FIX : We need to see unit line on PDF even though it's an option
 2020-07-29 13:18:17 +02:00
Laurent Destailleur
0928a5843b
Merge pull request #14300 from bafbes/abb110232 
fix:fetch and update model_pdf attribute for societe
 2020-07-29 13:11:51 +02:00
Laurent Destailleur
878b268a5e Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 2020-07-29 13:11:10 +02:00
Laurent Destailleur
377e331e6a
Merge pull request #14288 from atm-florianm/FIX_11.0_debugbar_body_bottom_margin_offset 
FIX 11.0: DebugBar hides content at page bottom
 2020-07-29 13:10:56 +02:00
Laurent Destailleur
6bd450dcd0 Doc 2020-07-29 13:10:31 +02:00
Laurent Destailleur
1d58785e73
Merge pull request #14306 from marc-dll/FIX_10.0_reassort_hooks 
FIX: product stock/reassort list: add hooks
 2020-07-29 13:07:17 +02:00
Laurent Destailleur
af177f2833
Update reassort.php 2020-07-29 13:07:02 +02:00
Laurent Destailleur
d1cb7d447f
Merge branch 'develop' into FIX_10.0_reassort_hooks 2020-07-29 13:05:12 +02:00
AXeL
3c6eb5e0e2 Add missing "Default values" menu entry to auguria menu 2020-07-29 13:02:11 +02:00
Laurent Destailleur
a0d3fd5756
Merge pull request #14289 from AXeL-dev/patch-12 
Add missing "Default values" menu entry to auguria menu
 2020-07-29 13:01:43 +02:00
Laurent Destailleur
b3b3042afc
Merge pull request #14308 from atm-lena/FIX_11.0_CommandFournFetch_Entity 
fetch() command fourn : Same management as commande.class.php of entity
 2020-07-29 13:01:13 +02:00
Laurent Destailleur
d9191c74d8
Update fournisseur.commande.class.php 2020-07-29 12:59:59 +02:00
Laurent Destailleur
cb8c8a1d50
Merge pull request #14305 from marc-dll/FIX_10.0_expedition_create 
FIX: shipping creation: checks not done on weight and sizes
 2020-07-29 12:59:23 +02:00
Laurent Destailleur
d2e730f8e5
Merge pull request #14310 from atm-gauthier/10.0_fix_wrong_column_order_by 
FIX : Order by amount in product propal stats must be done on d.total_ht and not p.total
 2020-07-29 12:58:28 +02:00
Tim Otte
85c5f423b1 Added fetch_thirdparty (without the site crashes) 2020-07-29 12:55:58 +02:00
Laurent Destailleur
00a4a9ba63
Merge pull request #14307 from Tim-Otte/fix-proposals-urgent 
v12: Fixed site crashes in comm/propal/card.php
 2020-07-29 12:54:27 +02:00
Laurent Destailleur
391fcc799b FIX #14279 2020-07-29 12:51:18 +02:00
Laurent Destailleur
44cfb77622 FIX #14292 2020-07-29 12:43:53 +02:00
Laurent Destailleur
41483df689 FIX #14076 2020-07-29 12:31:03 +02:00
Laurent Destailleur
c4b3781df0
Merge pull request #14315 from OPEN-DSI/v10-fix-contact-list-redirect-main-search 
FIX redirect on contact card from main search
 2020-07-29 12:25:38 +02:00
lvessiller
8ee5b16e89 FIX redirect on contact card from main search 2020-07-29 12:00:22 +02:00
VERDOL Gauthier
d214dbb5fd FIX : Order by amount in product propal stats must be done on d.total_ht and not p.total 2020-07-28 15:42:54 +02:00
atm-lena
b480fb2dfc Delete double line 2020-07-28 15:32:58 +02:00
atm-lena
9f0c3b0db1 fetch() command fourn : Same management as commande.class.php of entity 2020-07-28 15:13:56 +02:00
Tim Otte
c5816478d9 Added fetch_thirdparty (without the site crashes) 2020-07-28 11:14:55 +02:00
Tim Otte
08fc988d3a
Merge pull request #5 from Dolibarr/develop 
Merge changes since last PR
 2020-07-28 11:07:22 +02:00
Laurent Destailleur
81cb5501bc Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/admin/system/database-tables.php
 2020-07-28 10:32:27 +02:00
Laurent Destailleur
45eca85bae Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 
Conflicts:
	htdocs/admin/tools/dolibarr_export.php
 2020-07-28 10:29:14 +02:00
Laurent Destailleur
d46d34915e FIX Checkbox "drop table" was not checked when using php method for dump 2020-07-28 10:23:09 +02:00
Laurent Destailleur
364fb05ed3 Fix phpcs 2020-07-28 09:46:31 +02:00
Laurent Destailleur
4e4f0a4575 Use same case for all sql files 2020-07-28 09:44:48 +02:00