Commit Graph

89109 Commits

Author SHA1 Message Date
Laurent Destailleur
d3b17f4f2d FIX form not closed. 2019-09-17 12:08:33 +02:00
gauthier
2ac8bd4e16 FIX : If we share invoice, we need to see discount created from a deposit on each entity 2019-09-17 11:59:58 +02:00
Frédéric FRANCE
a44836ae40
Update CMailFile.class.php 2019-09-17 10:15:55 +02:00
VESSILLER
3654a5d01c FIX selectFields for GROUP BY and show only if units defined 2019-09-17 10:05:35 +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
Frédéric FRANCE
850b9fd52a
Merge remote-tracking branch 'upstream/develop' into zapier 2019-09-17 08:24:31 +02:00
Frédéric FRANCE
155e8fb500
fix syntax 2019-09-17 08:18:01 +02:00
Frédéric FRANCE
0d63c43ccd
add doaction to actioncommcard 2019-09-17 08:15:01 +02:00
Frédéric FRANCE
ecac1f9f40
wip 2019-09-17 08:02:55 +02:00
Frédéric FRANCE
a2d3cde291
some update after night 2019-09-17 07:59:46 +02:00
Laurent Destailleur
78386871f3 css 2019-09-17 03:33:58 +02:00
Frédéric FRANCE
fb7ef3cefc
Update card.php 2019-09-16 23:12:11 +02:00
Frédéric FRANCE
f369c1a80a
Update card.php 2019-09-16 20:59:13 +02:00
Frédéric FRANCE
67b73cf0e6
Update actioncomm.class.php 2019-09-16 20:57:20 +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
Frédéric FRANCE
e43f3a0f58
Update functions.lib.php 2019-09-16 18:07:06 +02:00
Frédéric FRANCE
5c00712c0a
Update functions.lib.php 2019-09-16 17:57:40 +02:00
John Botella
872f5ed85f fix_missing_expedition_table_line_tag 2019-09-16 16:49:08 +02:00
madx666
8d7d14c730
Fix return to list on page 1
When are on page 1 on any list and we go on an object, when return to the list, we are back on page 0
2019-09-16 15:39:58 +02:00
VESSILLER
555ea977c9 NEW Add units in select products lines 2019-09-16 15:32:31 +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
John Botella
010e58d957 Add switch view behavior 2019-09-16 13:56:07 +02:00
Daniel Seichter
1c5a5eb593 Added hint for setting up database (issue #11815) 2019-09-16 13:24:21 +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
VESSILLER
6e806a5aed FIX empty cache when we want to load specific warehouses in select 2019-09-16 10:37:55 +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
ptibogxiv
21c51eb3d2
Update invoice.php 2019-09-15 21:01:29 +02:00
ptibogxiv
ea1baefe9a
NEW: delete purchase price API 2019-09-15 20:50:18 +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