2
0
forked from Wavyzz/dolibarr
Commit Graph

10032 Commits

Author SHA1 Message Date
Alexandre SPANGARO
91b3bf76fd Merge branch 'develop' into 11.0_https 2019-10-01 06:11:43 +02:00
Frédéric FRANCE
3ba48fde93 Update api_invoices.class.php 2019-09-30 21:44:37 +02:00
Frédéric FRANCE
ea008aefd7 Update chargesociales.class.php 2019-09-30 20:21:10 +02:00
Frédéric FRANCE
0c908fb4ed Update chargesociales.class.php 2019-09-30 20:13:43 +02:00
Laurent Destailleur
14f7e48fe5 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2019-09-30 18:50:33 +02:00
Laurent Destailleur
a56b9e1ca9 The trigger BON_PRELEVEMENT has been renamed into
DIRECT_DEBIT_ORDER_CREATE.
2019-09-30 18:50:23 +02:00
Laurent Destailleur
cff8f582e7 Update bonprelevement.class.php 2019-09-30 18:47:18 +02:00
Laurent Destailleur
9d5b84ec44 Merge branch 'develop' into fix_9.0_withdraw_trigger_create_missing 2019-09-30 18:39:46 +02:00
Laurent Destailleur
2da5a506a9 Update facture.class.php 2019-09-30 18:25:03 +02:00
Laurent Destailleur
564e22009d Update facture.class.php 2019-09-30 18:22:37 +02:00
Laurent Destailleur
4f356fa412 Merge pull request #11859 from altatof/avoir
FIX : allow standalone credit note even if no invoice
2019-09-30 18:12:55 +02:00
Laurent Destailleur
945dd0ae89 Update card.php 2019-09-30 18:12:43 +02:00
Laurent Destailleur
b28cd1bb57 Merge pull request #11972 from aspangaro/11.0_fa_icon
NEW Add fa_icon on load_fiche_titre
2019-09-30 15:26:28 +02:00
Alexandre SPANGARO
aec50d3ac9 NEW Add fa_icon on load_fiche_titre 2019-09-30 10:14:55 +02:00
ptibogxiv
4177c72ae0 Update facture.class.php 2019-09-29 15:46:28 +02:00
ptibogxiv
2e8b99606e Update facture.class.php 2019-09-29 15:45:41 +02:00
ptibogxiv
5a096972c0 Update list.php 2019-09-29 15:42:39 +02:00
Laurent Destailleur
6966651d51 Standardize code to use dolSqlDateFilter 2019-09-28 13:22:05 +02:00
Alexandre SPANGARO
288aea190b Merge remote-tracking branch 'upstream/develop' into 11.0_fa_icon 2019-09-28 06:09:40 +02:00
Alexandre SPANGARO
7f93f046e9 NEW Add fa_icon on load_fiche_titre 2019-09-28 06:02:25 +02:00
Laurent Destailleur
07b555b965 Merge branch 'develop' into patch-255 2019-09-27 15:23:15 +02:00
Laurent Destailleur
f5c839217a Merge pull request #11914 from fmarcet/develop
Fix: Load invoices only if showed
2019-09-27 14:34:16 +02:00
Laurent Destailleur
f3bc319a78 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/expedition/class/expedition.class.php
	htdocs/takepos/takepos.php
2019-09-27 14:11:14 +02:00
Laurent Destailleur
6d1a571aed Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
Conflicts:
	htdocs/product/dynamic_price/class/price_parser.class.php
2019-09-27 14:07:11 +02:00
Laurent Destailleur
5d45638248 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-09-27 14:02:23 +02:00
Laurent Destailleur
6858dce344 Rename table for categorie of warehouses 2019-09-27 13:28:28 +02:00
Alexandre SPANGARO
e38bb89a2e NEW Add fa_icon on load_fiche_titre 2019-09-27 11:48:40 +02:00
Laurent Destailleur
99cfea1ff4 Update paiement_charge.php 2019-09-27 11:34:50 +02:00
Alexandre SPANGARO
b52e5d51e3 FIX colspan on VAT quadri report 2019-09-26 22:01:59 +02:00
Ferran Marcet
a8cc11d232 Merge branch 'developup' into develop 2019-09-24 13:38:11 +02:00
Alexandre SPANGARO
1b099733f5 Merge remote-tracking branch 'upstream/develop' into 11.0_translation 2019-09-24 08:42:57 +02:00
Alexandre SPANGARO
02dbc11f98 Move Gnu.org to https 2019-09-23 21:55:30 +02:00
Alexandre SPANGARO
1c13a38ce9 Typo abscissa 2019-09-23 21:45:23 +02:00
Alexandre SPANGARO
e32772fdc5 Translate 2019-09-20 09:44:49 +02:00
gauthier
575e4d11d0 FIX : wrong test 2019-09-19 17:28:51 +02:00
Laurent Destailleur
a43253eab8 Fix for deposit not correctly closed 2019-09-17 18:49:56 +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
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
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
6bfba0b731 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/core/menus/standard/eldy.lib.php
2019-09-15 15:17:38 +02:00
Alexandre SPANGARO
21e27389d4 NEW Bank Add an option for colorize background color of debit or credit movement 2019-09-14 20:58:12 +02:00
Alexandre SPANGARO
4420af683d Fix Bank entries - nowrap on amount 2019-09-14 05:44:28 +02:00
Laurent Destailleur
56a99f6e6d Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-09-12 11:22:13 +02:00
Laurent Destailleur
3f3282400a FIX SQL syntax error and CSRF check on vat reports 2019-09-11 13:57:15 +02:00
Christophe Battarel
c8cb5886f4 correction 2019-09-10 17:04:09 +02:00
Christophe Battarel
95417d4c86 allow standalone credit note even if no invoice 2019-09-10 16:24:04 +02:00
Laurent Destailleur
61cf47aa16 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-09-10 00:14:07 +02:00
Laurent Destailleur
1d74387125 Removed deprecated property ->numero (We must use ->num_payment) 2019-09-09 08:47:23 +02:00