Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-08 02:28:23 +01:00
Code Issues Packages Projects Releases Wiki Activity
68,347 Commits 36 Branches 190 Tags
b8c88a214449d5129fd4c479249cfa7c2373d10d
Commit Graph

68347 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
florian HENRY
b8c88a2144 rename var 2018-10-03 15:43:00 +02:00
florian HENRY
1b18781299 Merge branch '8.0' of https://github.com/Dolibarr/dolibarr.git into 8.0 2018-10-03 15:41:10 +02:00
florian HENRY
ef7ed97866 fix ressource list with extrafields 2018-10-03 15:40:58 +02:00
Laurent Destailleur
e83149a344 Fix deletion of credit card when no Oauth set 2018-10-02 22:35:51 +02:00
Laurent Destailleur
75b1cac33f FIX Pagination stats 2018-10-01 01:15:19 +02:00
Alexandre SPANGARO
14627abb27 FIX Title problem on admin RSS module 2018-10-01 01:14:43 +02:00
Laurent Destailleur
c07ab81e6a Fix trans 2018-09-28 02:22:23 +02:00
Laurent Destailleur
575c63f87d Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 
Conflicts:
	htdocs/core/class/CMailFile.class.php
 2018-09-27 12:52:10 +02:00
Laurent Destailleur
6e7fd15e1e Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 2018-09-27 12:48:08 +02:00
Laurent Destailleur
291d477f65 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 
Conflicts:
	htdocs/core/class/commonobject.class.php
 2018-09-27 12:47:48 +02:00
Laurent Destailleur
7b86776f6b Introduce option MAIN_INCLUDE_ZERO_VAT_IN_REPORTS to solve a regression 
on feature to report vat by rate when rate is zero
 2018-09-27 12:42:52 +02:00
Laurent Destailleur
96c1814793 FIX XSS vulnerability reported by Mary Princy E 2018-09-27 11:33:28 +02:00
Laurent Destailleur
4c8664b297 Merge pull request #9619 from ATM-Marc/FIX_6.0_extrafield_columns 
FIX: showOptionals: column mismatches
 2018-09-27 09:39:51 +02:00
Carsten Brandt
fee46ac845 Update german accounting file to use rowid 
- fix "TODO Fix this file to use rowid"
 2018-09-27 09:39:00 +02:00
Laurent Destailleur
2d88b69cf6 Merge pull request #9616 from frederic34/patch-14 
add try catch for swiftmailer
 2018-09-27 09:34:21 +02:00
Laurent Destailleur
bc5b794b1a Merge pull request #9613 from frederic34/patch-11 
FIX Option MAIN_DISABLE_NOTES_TAB #9611
 2018-09-27 09:30:56 +02:00
Laurent Destailleur
ee8b5030a0 Merge pull request #9610 from atm-john/FIX_situation_credit_note 
Fix situation credit note
 2018-09-27 09:26:23 +02:00
Laurent Destailleur
e3b1cb9fdb Update facture.class.php 2018-09-27 09:25:37 +02:00
Laurent Destailleur
77341470e1 Merge pull request #9608 from frederic34/patch-10 
comparaison of two boolean in rssparser.class.php
 2018-09-27 09:23:24 +02:00
Laurent Destailleur
46363a7705 Merge pull request #9607 from atm-gauthier/7.0_fix_replenish_entity 
FIX : need to filter on current entity on replenish
 2018-09-27 09:22:44 +02:00
Laurent Destailleur
ff3f1e933a Update replenish.php 2018-09-27 09:22:38 +02:00
Laurent Destailleur
e72dc26532 Merge pull request #9603 from atm-john/Fix_situation_invoice_selection 
FIX previous situation invoice selection
 2018-09-27 09:20:24 +02:00
Laurent Destailleur
2b8ccc0c81 FIX Link template invoice to contract 2018-09-27 01:53:12 +02:00
Marc de Lima Lucio
af93fc7484 FIX: showOptionals: column mismatches 2018-09-26 17:19:06 +02:00
Frédéric FRANCE
1bac3a0ccf swiftmailer is doing encodetorfc2822 2018-09-26 10:37:20 +02:00
Frédéric FRANCE
92a3faeaf7 add try catch for swiftmailer 2018-09-26 10:13:14 +02:00
Frédéric FRANCE
a9f7bdead6 fix Option MAIN_DISABLE_NOTES_TAB #9611 2018-09-25 15:22:08 +02:00
Laurent Destailleur
e39e54503e Fix responsive 2018-09-25 12:54:24 +02:00
Laurent Destailleur
515acbfee2 FIX Bad position of hook formattachOptions call 2018-09-25 11:46:42 +02:00
John BOTELLA
022f842cb0 Fix display good progress for new situation invoices 2018-09-25 10:28:47 +02:00
John BOTELLA
791c373db5 FIX credit note progression 2018-09-25 09:54:58 +02:00
Frédéric FRANCE
d15c52db3b Update rssparser.class.php 2018-09-25 08:16:05 +02:00
Laurent Destailleur
df64961c6b FIX nb of session in title 2018-09-24 21:56:57 +02:00
gauthier
fc7c0ce521 FIX : need to filter on current entity on replenish 2018-09-24 16:23:44 +02:00
John BOTELLA
b1380a6902 FIX situation invoice total with credit note 2018-09-24 16:12:00 +02:00
Laurent Destailleur
26d585ffbe Use latest instead of last 2018-09-24 10:43:01 +02:00
Laurent Destailleur
57e359cd40 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 
Conflicts:
	htdocs/langs/en_US/admin.lang
	htdocs/langs/fr_FR/agenda.lang
 2018-09-24 10:18:13 +02:00
John BOTELLA
ceccd5a510 Fix prev situation invoice selection 2018-09-24 10:16:28 +02:00
Laurent Destailleur
40bed96a01 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 2018-09-24 10:15:20 +02:00
Laurent Destailleur
dbb75e35a1 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 
Conflicts:
	htdocs/compta/facture/list.php
	htdocs/langs/en_US/admin.lang
	htdocs/langs/fr_FR/agenda.lang
 2018-09-24 10:14:38 +02:00
Laurent Destailleur
2dbb82fc76 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 2018-09-24 10:03:21 +02:00
Laurent Destailleur
12690666e2 Missing trans 2018-09-24 10:03:08 +02:00
Laurent Destailleur
969be3a2a7 Merge pull request #9595 from ptibogxiv/patch-66 
FIX number mailing for a contact with multicompany
 2018-09-23 15:45:06 +02:00
Laurent Destailleur
39e9029e41 Update contact.class.php 2018-09-23 15:44:44 +02:00
Laurent Destailleur
9ddc1770e8 Merge pull request #9501 from atm-gauthier/7.0_fix_tva_if_buyer_hors_cee_and_particulier 
FIX : According to french law, if seller is in France and buyer isn't…
 2018-09-23 15:41:33 +02:00
Laurent Destailleur
1569770855 Rename hidden conf into MAIN_USE_VAT_OF_PRODUCT_FOR_INDIVIDUAL_CUSTOMER_OUT_OF_EEC 2018-09-23 15:41:22 +02:00
ptibogxiv
77dd516023 fix number mailing for a contact / multicompany 2018-09-22 14:45:15 +02:00
gauthier
7b46bedce6 NEW : hidden configuration 2018-09-21 14:35:36 +02:00
Laurent Destailleur
7a422c9d24 Merge pull request #9578 from fmarcet/8.0 
FIX #9432 Assign yourself as a commercial when you don't have permission to see all thirds
 2018-09-21 11:30:38 +02:00
Ferran Marcet
d6d58b1f68 FIX #9432 2018-09-21 10:18:54 +02:00