com4WEB
7455d772a2
Update README.md
2019-09-18 10:50:07 +02:00
VESSILLER
ca18448b48
NEW add units fields in buying price tab of product card
2019-09-18 10:36:13 +02:00
Frédéric FRANCE
c01ab451cc
Update box_fournisseurs.php
2019-09-17 23:04:43 +02:00
Frédéric FRANCE
c38c0bec1c
Update box_fournisseurs.php
2019-09-17 23:03:37 +02:00
Frédéric FRANCE
87d41256d4
Update box_contacts.php
2019-09-17 22:59:23 +02:00
Laurent Destailleur
a43253eab8
Fix for deposit not correctly closed
2019-09-17 18:49:56 +02:00
Laurent Destailleur
3f6afa810c
Code comment
2019-09-17 17:55:30 +02:00
Laurent De Coninck
49b75e3f52
support referent in the beluga export.
...
The beluga export of a project, now supports additional referents, coming from the hooks. When the element is present in the view of all elements of the project, the beluga export will also export this element.
[see: X]
2019-09-17 17:40:42 +02:00
Frédéric FRANCE
5e7b7bbc33
Update eldy.lib.php
2019-09-17 13:31:45 +02:00
Laurent Destailleur
214bf4375e
Fix missing include
2019-09-17 13:28:36 +02:00
Laurent Destailleur
24cb1390e4
FIX Update of leave request when CSRF with token is on
...
FIX Export of leave request show the number of open days
2019-09-17 13:17:25 +02:00
Laurent Destailleur
41a2a25729
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/bank/ligne.php
2019-09-17 12:23:58 +02:00
Laurent Destailleur
90850c4d31
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
2019-09-17 12:20:23 +02:00
Laurent Destailleur
ab9dee631b
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
2019-09-17 12:20:05 +02:00
Laurent Destailleur
64c53e2e85
Fix "project i am contact for" filter
2019-09-17 12:19:33 +02:00
Laurent Destailleur
b53293d84d
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
2019-09-17 12:18:38 +02:00
Laurent Destailleur
a91f39ea3e
FIX selection of project i am contact of.
2019-09-17 12:18:29 +02:00
Laurent Destailleur
d3b17f4f2d
FIX form not closed.
2019-09-17 12:08:33 +02:00
Frédéric FRANCE
a44836ae40
Update CMailFile.class.php
2019-09-17 10:15:55 +02:00
Ferran Marcet
81d8055a9c
New: Load invoices only if showed
2019-09-17 09:43:15 +02:00
Ferran Marcet
3f25a8d8d5
New: Load invoices only if showed
2019-09-17 09:38:08 +02:00
Ferran Marcet
e4984492b3
Dejarlo igual que develop
2019-09-17 09:32:43 +02:00
Ferran Marcet
c48fc3a2cf
Merge branch 'developup' into develop
...
# Conflicts:
# htdocs/compta/facture/fiche-rec.php
# htdocs/install/mysql/migration/9.0.0-10.0.0.sql
2019-09-17 09:27:42 +02:00
Laurent Destailleur
78386871f3
css
2019-09-17 03:33:58 +02:00
Laurent Destailleur
68842b0b63
Fix css for company logo in top menu
2019-09-16 19:08:45 +02:00
Laurent Destailleur
8d79404914
Fix css for responsive
2019-09-16 18:40:58 +02:00
Laurent Destailleur
e3480780cf
Fix label on "Connect" button on Simple POS module
2019-09-16 18:31:40 +02:00
Laurent Destailleur
5233e7d8ad
FIX do not output return code on screen after a select of bank account
2019-09-16 18:29:04 +02:00
Laurent Destailleur
34fc04903a
Introduce a logo squarred into setup (MAIN_INFO_SOCIETE_LOGO_SQUARRED,
...
MAIN_INFO_SOCIETE_LOGO_SQUARRED_MINI, ...)
2019-09-16 15:26:13 +02:00
Laurent Destailleur
36326fa5c0
Add squarre logo
2019-09-16 15:18:35 +02:00
Laurent Destailleur
23777fd5ff
Fix css
2019-09-16 11:19:02 +02:00
Laurent Destailleur
abee6dceaa
Fix css demo
2019-09-16 11:16:58 +02:00
Laurent Destailleur
f5dd4f4f9e
css
2019-09-16 11:08:34 +02:00
Laurent Destailleur
edbf8f0186
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
2019-09-16 11:01:21 +02:00
Laurent Destailleur
eb70411ae0
Css demo
2019-09-16 11:01:09 +02:00
Laurent Destailleur
ccd468149b
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2019-09-16 10:24:53 +02:00
Laurent Destailleur
4db6badfc2
Fix link when no title in search of website content
2019-09-16 10:24:41 +02:00
Laurent Destailleur
a085b79993
Merge pull request #11898 from atm-maxime/patch-1
...
Remove bad copy / paste
2019-09-15 19:58:28 +02:00
Laurent Destailleur
4be60f9493
Merge pull request #11899 from atm-maxime/patch-2
...
Fix #11876
2019-09-15 19:26:00 +02:00
Laurent Destailleur
12d67c5f85
Rename api to get all purchase prices
2019-09-15 17:18:10 +02:00
Maxime Kohlhaas
48cbcdc757
Fix #11876
2019-09-15 17:08:21 +02:00
Laurent Destailleur
68a3c5b41c
Merge pull request #11853 from ptibogxiv/patch-259
...
NEW add supplier's product list
2019-09-15 17:04:17 +02:00
Laurent Destailleur
5d0ba10f34
Update api_products.class.php
2019-09-15 17:04:08 +02:00
Maxime Kohlhaas
5d4f702920
Remove bas copy / paste
2019-09-15 16:38:03 +02:00
Laurent Destailleur
0194f48041
Merge pull request #10795 from altatof/clonecat
...
NEW : copy linked categories on product clone process
2019-09-15 16:34:42 +02:00
Laurent Destailleur
23860b15ee
Try a fix for #11852
2019-09-15 16:00:01 +02:00
Laurent Destailleur
421631f2be
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
2019-09-15 15:53:45 +02:00
Laurent Destailleur
bb6853a635
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
2019-09-15 15:53:15 +02:00
Laurent Destailleur
ab07da02c4
Fix scrutinizer
2019-09-15 15:53:04 +02:00
Laurent Destailleur
434ab2965a
Merge pull request #11820 from OPEN-DSI/new-resource-add-event-check-busy
...
NEW check if a resource is in use in an event
2019-09-15 15:47:07 +02:00