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

68800 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Laurent Destailleur
ea35e45f76
Merge pull request #10197 from atm-maxime/fix_import_bank 
Fix unexistant fields
 2018-12-14 17:40:45 +01:00
PMickael
37daface19 [Accounting][VAT] Fix balance should be based on period 
[Accounting][VAT] Fix balance should be based on period
 2018-12-14 17:23:45 +01:00
Laurent Destailleur
539e2c55cd FIX #9629 #9625 2018-12-14 10:33:07 +01:00
Laurent Destailleur
735d04bd2a Merge 2018-12-13 20:48:07 +01:00
Laurent Destailleur
dcb43214d6 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2018-12-13 20:46:05 +01:00
Laurent Destailleur
7a3ab13196 FIX #10183 using backport of fix done in 9.0 2018-12-13 20:45:51 +01:00
Laurent Destailleur
603656c7de
Merge pull request #10219 from simnandez/8.0 
FIX: #10218 Bad redirection after deleting a user or group
 2018-12-13 20:02:53 +01:00
Laurent Destailleur
4413b2e886
Merge pull request #10215 from atm-quentin/8.0_FIX_if_qty_is_0 
FIX if qty is 0
 2018-12-13 19:56:38 +01:00
Laurent Destailleur
6ad106d14a
Update fournisseur.facture.class.php 2018-12-13 19:56:22 +01:00
Juanjo Menent
22c34bd656 Fix: MenuBankCash Translation is in english in es_ES 2018-12-12 12:09:07 +01:00
Juanjo Menent
d1eed14488 FIX: #10218 Bad redirection after deleting a user or group 2018-12-11 13:25:33 +01:00
Laurent Destailleur
4a61c1b6ed FIX lang not loaded 2018-12-11 13:25:09 +01:00
atm-quentin
3da9650003 FIX if qty is 0 2018-12-10 16:06:11 +01:00
Laurent Destailleur
42d4cf9992 Fix sql 2018-12-10 10:17:54 +01:00
Laurent Destailleur
ff8f235b7e Fix regression when disabling table 2018-12-10 00:15:22 +01:00
Laurent Destailleur
930312b425 FIX Migration do not create not used table 2018-12-08 11:51:46 +01:00
Laurent Destailleur
9ed34e2b35 FIX Can relaunch install on v8 2018-12-08 11:51:01 +01:00
Laurent Destailleur
eaa7fe5d14 Removed deprecated code 2018-12-08 11:41:55 +01:00
Laurent Destailleur
d2f0c87d8f FIX Removed not use table 2018-12-08 11:41:08 +01:00
Maxime Kohlhaas
550df138a6 Fix unexistant fields 2018-12-07 12:19:50 +01:00
Laurent Destailleur
5ce26bae1b Fix form of bank info for CH 2018-12-04 22:01:35 +01:00
Laurent Destailleur
f142238817 Fix missing field canvas 2018-12-04 21:25:59 +01:00
Laurent Destailleur
8e333c3feb Standardize code 2018-12-04 14:54:58 +01:00
Laurent Destailleur
d80baaea69 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 
Conflicts:
	htdocs/comm/propal/class/propal.class.php
	htdocs/commande/class/commande.class.php
	htdocs/contrat/class/contrat.class.php
	htdocs/expensereport/class/expensereport.class.php
	htdocs/fourn/class/fournisseur.commande.class.php
	htdocs/fourn/class/fournisseur.facture.class.php
 2018-12-04 14:29:47 +01:00
Laurent Destailleur
779d33cf02
Merge pull request #10085 from fmarcet/7.0 
FIX Lines are not inserted correctly if VAT have code
 2018-12-04 13:55:57 +01:00
Laurent Destailleur
5061a9b0c2 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 
Conflicts:
	htdocs/install/mysql/tables/llx_paiementfourn.sql
 2018-12-04 13:17:25 +01:00
Laurent Destailleur
347384734d Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 
Conflicts:
	htdocs/install/mysql/tables/llx_paiementfourn.sql
 2018-12-04 13:15:32 +01:00
Ferran Marcet
602986ced8 Merge remote-tracking branch 'origin/7.0' into 7.0 
# Conflicts:
#	htdocs/comm/propal/class/propal.class.php
#	htdocs/commande/class/commande.class.php
#	htdocs/expensereport/class/expensereport.class.php
#	htdocs/fourn/class/fournisseur.commande.class.php
 2018-12-03 12:33:18 +01:00
Ferran Marcet
7247b14bd9 FIX Lines are not inserted correctly if VAT have code 2018-12-03 12:28:17 +01:00
Ferran Marcet
135a94dfed Merge branch '7.0up' into 7.0 2018-12-03 11:59:46 +01:00
Ferran Marcet
8312d57d16 FIX Lines are not inserted correctly if VAT have code 2018-12-03 11:58:39 +01:00
Laurent Destailleur
07425e4e19
Merge pull request #10156 from grandoc/7.0_bug 
FIX #3234
 2018-12-02 17:06:06 +01:00
Philippe GRAND
8ec2bac36a FIX #3234 2018-12-02 10:02:05 +01:00
Laurent Destailleur
0668f90e14
Merge pull request #10146 from atm-maxime/fix_ecm_expensereport 
Fix expense report in ecm auto dir
 2018-12-01 23:02:09 +01:00
Maxime Kohlhaas
5e2f3a53c9 Fix expense report in ecm auto dir 2018-12-01 19:39:00 +01:00
Laurent Destailleur
cb9ada2119 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 
Conflicts:
	htdocs/core/class/html.form.class.php
	htdocs/core/class/html.formmail.class.php
	htdocs/core/modules/modSociete.class.php
	htdocs/product/price.php
 2018-12-01 18:19:45 +01:00
Laurent Destailleur
a49a083629
Merge pull request #10142 from atm-maxime/fix_import_fk_dept 
Fix add missing fk_department and fk_pays in contact/bank imports
 2018-12-01 17:14:27 +01:00
Laurent Destailleur
e30bee50a2
Merge pull request #10139 from atm-john/fix_#8741 
FIX #8741
 2018-12-01 17:12:55 +01:00
Maxime Kohlhaas
13806124b2 Fix add missing fk_department and fk_pays in contact/bank imports 2018-12-01 17:11:04 +01:00
ATM John BOTELLA
474228cbd6 FIX #8741 2018-12-01 17:01:11 +01:00
Laurent Destailleur
b41e0a40e7
Merge pull request #10138 from inoveaconseil/patch-4 
FIX #6580
 2018-12-01 16:56:31 +01:00
Inovea Conseil
18281d9d43
FIX #6580 
FIX #6580
 2018-12-01 16:48:50 +01:00
Laurent Destailleur
e4bc9f8f87
Merge pull request #10136 from grandoc/8.0 
fix :#9967
 2018-12-01 16:45:37 +01:00
Maxime Kohlhaas
748dd12e4d
Merge pull request #9056 from ATM-Nicolas/fix_default_preselected_mail_model 
FIX : Select first mail model by default
 2018-12-01 16:39:22 +01:00
Laurent Destailleur
3d09b05338
Merge pull request #10135 from atm-florian/8.0_fix9999 
fix #9999
 2018-12-01 16:31:02 +01:00
Philippe GRAND
bbf3b3baac fix :#9967 2018-12-01 16:27:14 +01:00
florian HENRY
c320dcd161 Merge branch '8.0' of https://github.com/Dolibarr/dolibarr.git into 8.0_fix9999 2018-12-01 16:24:20 +01:00
florian HENRY
589511f38c fix #9999 2018-12-01 16:23:40 +01:00
Laurent Destailleur
3ea69cb1f1
Merge pull request #10130 from inoveaconseil/patch-3 
Fix #9572
 2018-12-01 16:22:38 +01:00
Laurent Destailleur
508cb459eb
Merge pull request #10134 from frederic34/patch-18 
devcamp 2018 fix #9642
 2018-12-01 16:21:30 +01:00