Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
75,319 Commits 36 Branches 189 Tags
2bc93b9748604e474ee7d0f0e6421c424f996746
Commit Graph

6736 Commits

Author SHA1 Message Date
Laurent Destailleur
4e82a6da46 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-10-19 14:29:32 +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
b6cb16a457 Merge pull request #9783 from frederic34/patch-18 
Update menubase.class.php
 2018-10-19 13:44:11 +02:00
Laurent Destailleur
762d82f2fe Move declaration into common 2018-10-19 13:38:05 +02:00
Laurent Destailleur
8af16609ca Merge pull request #9779 from frederic34/patch-15 
Update html.formmail.class.php
 2018-10-19 13:02:15 +02:00
Laurent Destailleur
324f59ecc9 Merge pull request #9778 from frederic34/patch-9 
add errors def to form class
 2018-10-19 13:01:31 +02:00
Laurent Destailleur
44e0bc9aed Merge pull request #9812 from frederic34/docodt 
add log and comment
 2018-10-19 12:53:54 +02:00
Laurent Destailleur
696023c1aa NEW Enhancement in the generic file manager 2018-10-19 12:47:59 +02:00
Frédéric FRANCE
6c85fbbc30 add log and comment 2018-10-18 21:47:10 +02:00
Frédéric FRANCE
0f7b1a04d9 Merge remote-tracking branch 'upstream/develop' into patch-15 2018-10-18 20:42:52 +02:00
Frédéric FRANCE
3437943609 Merge remote-tracking branch 'upstream/develop' into patch-9 2018-10-18 20:41:36 +02:00
Frédéric FRANCE
300f80e914 Merge remote-tracking branch 'upstream/develop' into patch-18 2018-10-18 20:39:45 +02:00
Laurent Destailleur
52840478c0 Clean code 2018-10-17 21:11:07 +02:00
gauthier
aea7299970 FIX : use discount with multicurrency 2018-10-17 15:49:08 +02:00
Laurent Destailleur
a66256a799 FIX Hover on the filemanager 2018-10-17 13:22:52 +02:00
Frédéric FRANCE
70b6c502da Update menubase.class.php 2018-10-16 23:36:00 +02:00
Frédéric FRANCE
cf1819ea0e Update html.formmail.class.php 2018-10-16 22:27:34 +02:00
Frédéric FRANCE
2d542d028f Update html.formmail.class.php 2018-10-16 22:22:57 +02:00
Frédéric FRANCE
4e14c2817c add errors def to form class 2018-10-16 22:09:11 +02:00
Laurent Destailleur
f07096ea3a Merge pull request #9760 from frederic34/patch-19 
add errors def in htmlformsms
 2018-10-16 20:01:41 +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
Laurent Destailleur
2c1e8d6535 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/accountancy/bookkeeping/balance.php
	htdocs/expedition/class/expeditionbatch.class.php
	htdocs/public/payment/newpayment.php
	htdocs/stripe/config.php
 2018-10-16 18:47:11 +02:00
atm-ph
72dd182b1f Fix list from 'Contacts/Addresses' on company may show duplicate value for extrafields 2018-10-16 18:22:43 +02:00
Philippe GRAND
729ff0b9bb Merge remote-tracking branch 'upstream/develop' into new_branch_10_10_2018 2018-10-16 14:20:11 +02:00
Laurent Destailleur
70366e9d91 Missing translation 2018-10-16 03:31:33 +02:00
Laurent Destailleur
35f9371343 Fix missing es translation string 2018-10-16 03:30:17 +02:00
Frédéric FRANCE
9133d97e33 add errors def in htmlformsms 2018-10-15 21:40:27 +02:00
Laurent Destailleur
5d9b770511 phpcs 2018-10-15 13:32:09 +02:00
Philippe GRAND
995e9b4f55 Merge remote-tracking branch 'upstream/develop' into new_branch_10_10_2018 2018-10-12 12:16:57 +02:00
Laurent Destailleur
ded5c4c3dd Social network module 2018-10-12 11:02:03 +02:00
Philippe GRAND
f13c38e117 Merge remote-tracking branch 'upstream/develop' into new_branch_10_10_2018 2018-10-11 09:14:40 +02:00
atm-quentin
489ccc3c49 NEW list and fix conf 2018-10-10 12:19:57 +02:00
Laurent Destailleur
2b33e2a9c5 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-10-10 10:52:58 +02:00
Laurent Destailleur
40f89d138f Fix height of confirm popup 2018-10-10 10:52:29 +02:00
Philippe GRAND
90cb6150c4 Standardize and update code 2018-10-10 09:16:01 +02:00
Philippe GRAND
69379dc2bb Standardize and update code 2018-10-10 09:12:25 +02:00
atm-quentin
7ad4a7e384 NEW creation facture fourn depuis reception 2018-10-09 16:26:40 +02:00
Laurent Destailleur
0938ac4afa Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop

Conflicts:
	htdocs/user/list.php
 2018-10-09 14:54:18 +02:00
Laurent Destailleur
3c8b365c3e Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-10-09 14:53:39 +02:00
Philippe GRAND
bba6669f03 Merge remote-tracking branch 'upstream/develop' into new_branch_05_10_2018 2018-10-09 08:47:26 +02:00
Laurent Destailleur
1c74dcc270 NEW Can filter on EEC, not EEC, etc... in binding step of accountancy 2018-10-09 01:47:37 +02:00
Laurent Destailleur
6ded9e843d NEW The binding step in accountancy has a country filter like a combo 2018-10-09 01:03:46 +02:00
atm-quentin
c6ab79bad3 NEW note, contact and lines on card 2018-10-08 16:54:33 +02:00
Laurent Destailleur
0c7b7ed7f4 FIX Required extrafield value numeric should accept '0' 2018-10-08 14:26:18 +02:00
Laurent Destailleur
7be9b6d94e Fix translation of source of proposals 2018-10-08 14:04:22 +02:00
Abbes Bahfir
f0d8a5da9a Fix: Reminder : TODO Add Javascript code to add input fields contents to new elements urls 2018-10-08 12:39:59 +01:00
Abbes Bahfir
7d25311ce5 New : Link to create new element on linked fields 2018-10-08 10:59:01 +01:00
Laurent Destailleur
08ca85e995 Fix type 2018-10-08 02:19:32 +02:00
Laurent Destailleur
df7f218d01 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-10-07 21:47:32 +02:00