Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
71,061 Commits 36 Branches 189 Tags
01e7b5747d3ece7bb4623c8889ffa98ebb39bc7c
Commit Graph

8368 Commits

Author SHA1 Message Date
Regis Houssin
89389baeac Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop_email 2018-11-09 15:37:29 +01:00
Laurent Destailleur
c74ad61365 Fix look and feel v8 2018-11-08 10:04:25 +01:00
Laurent Destailleur
976516a796 Fix look and feel v8 2018-11-08 09:51:46 +01:00
Laurent Destailleur
66ffcf287a Fix filter on extrafields 2018-11-07 12:49:17 +01:00
Laurent Destailleur
4a25317f10 Fix security on GETPOST('action'). Param must be sanitized. 2018-11-05 20:29:07 +01:00
Laurent Destailleur
c0f4ec5a3e FIX sanitize param $action 2018-11-05 17:53:31 +01:00
Laurent Destailleur
0c7f33e1ba Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-11-05 09:58:19 +01:00
Laurent Destailleur
2900947019 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2018-11-05 09:56:57 +01:00
Laurent Destailleur
e1e0001fda Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 2018-11-05 09:56:00 +01:00
Regis Houssin
9589f69574 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into 
develop_email

Conflicts:
	htdocs/core/modules/facture/doc/doc_generic_invoice_odt.modules.php
 2018-10-30 18:29:28 +01:00
Laurent Destailleur
68f6ebd0ff Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/commande/class/commande.class.php
	htdocs/core/lib/security.lib.php
	htdocs/modulebuilder/template/myobject_card.php
 2018-10-30 14:47:39 +01:00
Laurent Destailleur
0127682996 Merge pull request #9881 from grandoc/8.0 
merging and typo
 2018-10-30 12:41:56 +01:00
Laurent Destailleur
8fbf5b1f33 FIX deletion on draft is allowed if we are allwoed to create 2018-10-29 18:28:19 +01:00
Laurent Destailleur
0266db7aa8 FIX deletion on draft is allowed if we are allwoed to create 2018-10-29 18:19:40 +01:00
Laurent Destailleur
d02fccd7e4 Fix deletion of draft invoice 2018-10-29 14:56:00 +01:00
Laurent Destailleur
824757bca6 Fix perm to delete 2018-10-29 14:47:33 +01:00
Laurent Destailleur
27d82d0e8e FIX Delete of draft invoice 2018-10-29 14:41:00 +01:00
Laurent Destailleur
85b8c9f219 FIX Delete of draft invoice 2018-10-29 14:35:42 +01:00
Regis Houssin
569d59d251 FIX change my deprecated email 2018-10-27 14:43:12 +02:00
Maxime Kohlhaas
1b054f1b36 Fix invoice creation from contract was invoicing closed services #9087 2018-10-27 09:21:49 +02:00
Laurent Destailleur
087b68948d Fix: do not use point for graph with too many points. 2018-10-26 17:32:32 +02:00
Laurent Destailleur
852b069785 Fix reponsive in stats pages 2018-10-26 15:46:17 +02:00
Philippe GRAND
f450e04856 Merge remote-tracking branch 'upstream/8.0' into 8.0 2018-10-26 15:38:15 +02:00
Frédéric FRANCE
86d854f3f4 Squiz.WhiteSpace.ControlStructureSpacing.SpacingBeforeClose 2018-10-24 23:04:26 +02:00
Laurent Destailleur
c9dca22df2 Merge pull request #9854 from atm-john/NEW_missing_payment_date_col 
NEW Add due date column in payment lists
 2018-10-24 12:27:59 +02:00
Laurent Destailleur
65a39269d9 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop

Conflicts:
	htdocs/core/class/commondocgenerator.class.php
 2018-10-24 03:39:33 +02:00
Laurent Destailleur
01adaf253c Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/bank/class/account.class.php
	htdocs/product/list.php
 2018-10-24 03:35:44 +02:00
Laurent Destailleur
1d80e16ad1 Merge pull request #9831 from frederic34/payment 
payments
 2018-10-24 03:25:01 +02:00
Laurent Destailleur
f8316abfc0 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 
Conflicts:
	htdocs/compta/bank/class/account.class.php
	htdocs/theme/md/style.css.php
 2018-10-24 02:58:29 +02:00
Laurent Destailleur
919c4fc5bc Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 
Conflicts:
	htdocs/theme/md/style.css.php
 2018-10-24 02:40:57 +02:00
atm-john
bed5084bcf Add missing Max payment date col 2018-10-23 21:44:45 +02:00
Laurent Destailleur
c8aa884462 Fix search all 2018-10-23 17:16:46 +02:00
Frédéric FRANCE
5f6cbda5a6 Update facture.class.php 2018-10-20 22:34:00 +02:00
Frédéric FRANCE
fbc5ce623e payments 2018-10-20 17:17:21 +02:00
Laurent Destailleur
b32ffdbbb9 Clean code 2018-10-19 14:59:00 +02:00
Laurent Destailleur
6a6a8ae14b Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-10-19 14:29:22 +02:00
Laurent Destailleur
5a1a5548df Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 
Conflicts:
	htdocs/core/actions_massactions.inc.php
	htdocs/core/class/discount.class.php
	htdocs/core/lib/payments.lib.php
	htdocs/product/index.php
	htdocs/product/list.php
	htdocs/societe/class/societe.class.php
 2018-10-19 14:27:15 +02:00
Laurent Destailleur
762d82f2fe Move declaration into common 2018-10-19 13:38:05 +02:00
Laurent Destailleur
cff2b923f9 Merge pull request #9784 from ptibogxiv/patch-80 
FIX harmony in date name with API
 2018-10-19 13:29:59 +02:00
Frédéric FRANCE
256ee40d0a Merge remote-tracking branch 'upstream/develop' into patch-16 2018-10-18 21:01:49 +02:00
Laurent Destailleur
05326e271d FIX Filter on invoice type 2018-10-18 17:15:26 +02:00
Laurent Destailleur
7cafdc4d9a Fix phpcs 2018-10-18 16:56:43 +02:00
gauthier
aea7299970 FIX : use discount with multicurrency 2018-10-17 15:49:08 +02:00
Frédéric FRANCE
7d8ff04292 Update paiement.class.php 2018-10-17 08:15:12 +02:00
ptibogxiv
a77458cb36 Update facture.class.php 2018-10-17 00:07:21 +02:00
ptibogxiv
3fdf3c95b4 FIX harmony in date name with API 2018-10-17 00:04:44 +02:00
Frédéric FRANCE
2e77b9fed9 fix phpunit 2018-10-16 22:42:18 +02:00
Laurent Destailleur
8d815c4e6b Merge pull request #9766 from ptibogxiv/patch-73 
ADD support of external modepayment
 2018-10-16 20:30:24 +02:00
Laurent Destailleur
f1c85cb36d Merge pull request #9757 from frederic34/patch-9 
do not trim int
 2018-10-16 19:37:07 +02:00
Laurent Destailleur
97429aeb7a Merge pull request #9721 from grandoc/new_branch_10_10_2018 
Standardize and update code
 2018-10-16 19:30:19 +02:00