Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
81,180 Commits 36 Branches 189 Tags
0a125f73b5ae8ef858ec3a901b2f68045ddbb16c
Commit Graph

3068 Commits

Author SHA1 Message Date
Laurent Destailleur
361fc53685 FIX div not balanced 2019-07-19 17:47:54 +02:00
Regis Houssin
cbda42d146 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop_menu 2019-07-19 09:37:34 +02:00
Laurent Destailleur
50480bf517 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/opensurvey/index.php
 2019-07-18 18:23:24 +02:00
Laurent Destailleur
f44182c89f Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2019-07-16 00:13:52 +02:00
Regis Houssin
294bc5dcb5 FIX avoid conflict with "$classname" in card.php 2019-07-15 10:19:06 +02:00
Maxime Kohlhaas
9c47cb6f91 NEW : can choose lines while creating order from origin 2019-07-08 23:16:32 +02:00
Laurent Destailleur
0a7d70829f Translation of some comments 2019-07-05 21:37:25 +02:00
Laurent Destailleur
7de92070d7 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop

Conflicts:
	htdocs/contrat/card.php
	htdocs/contrat/class/contrat.class.php
 2019-06-29 16:46:16 +02:00
Laurent Destailleur
adb3062a9f Work on nblignes -> nblines 2019-06-29 16:38:14 +02:00
ptibogxiv
174e531d69 Update commande.class.php 2019-06-25 18:12:16 +02:00
ptibogxiv
9e88bf1f1c NEW multilangs in fetch_lines 2019-06-25 15:41:20 +02:00
Laurent Destailleur
fa476b4994 Properties ->libelle_incoterms were renamed into ->label_incoterms 2019-06-25 13:00:02 +02:00
Laurent Destailleur
5675e7c50e Clean code of deprecated method 2019-06-22 18:19:40 +02:00
Nicolas ZABOURI
2e4db8c83c Merge remote-tracking branch 'Dolibarr/10.0' into MissingHook 2019-06-19 08:39:05 +02:00
ICstage
820c420ae5 FIX Missing hooks 2019-06-18 14:07:52 +02:00
Laurent Destailleur
a74eaaff4d Fix sort of linked elements 2019-06-17 15:54:54 +02:00
Regis Houssin
6597c9f60d Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop_menu 2019-06-17 06:45:08 +02:00
ptibogxiv
651f4158ac Fix add / delete contact access 2019-06-16 14:18:26 +02:00
ptibogxiv
70d9d3ab4c FIX contact default list with adding job/function 
as my last commit it's same contact but  différent job / function. More clear for choosing right contact in the list (PR from my dolibarr's customer)
 2019-06-04 18:23:25 +02:00
Regis Houssin
38246b4088 NEW add new function "setEntity()" 2019-06-03 11:13:26 +02:00
Regis Houssin
7b8b1a9052 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop_menu 2019-06-03 11:04:28 +02:00
Laurent Destailleur
2218994958 FIX Duplicate encoding on error message 2019-05-29 09:51:45 +02:00
Lionel VESSILLER
1c1b3c376e Fix check if order line is not in a shipment line before deleting 2019-05-23 15:57:02 +02:00
Regis Houssin
4f2f23f522 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop_menu 2019-05-22 08:45:31 +02:00
Laurent Destailleur
22e897b1a1 Clean and prepare code to fix a SQL injection 2019-05-21 17:22:38 +02:00
Regis Houssin
2cf630c213 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop_menu 2019-05-20 16:10:47 +02:00
Laurent Destailleur
11fea03074 Merge pull request #11026 from atm-john/new_look_and_feel_title_button 
NEW : look and feel title button
 2019-05-18 16:04:47 +02:00
florian HENRY
02af7ca25e fix pb with multicompny payment dictionnary on faxcture card 2019-05-18 12:11:28 +02:00
Francis Appels
a2d4a59321 Merge branch 'develop' into clean_10_beta 2019-05-13 21:27:13 +02:00
Laurent Destailleur
5876582030 Fix responsive 2019-05-12 15:56:29 +02:00
Regis Houssin
b73df2698d FIX better compatibility with Multicompany 2019-05-12 14:25:41 +02:00
Laurent Destailleur
3def11d5c9 Standardize translation 2019-05-10 19:32:46 +02:00
Laurent Destailleur
9de0e69456 FIX column project into list 2019-05-10 15:11:06 +02:00
Laurent Destailleur
5625c94c44 Fix missing label on project tooltip 2019-05-10 14:40:15 +02:00
Laurent Destailleur
0e8184332e Fix missing label on project tooltip 2019-05-10 14:39:05 +02:00
Laurent Destailleur
a94c291b76 Dolibarization 2019-05-09 16:59:06 +02:00
Francis Appels
18c5c586ab Cleanup set_draft in syslog 2019-05-01 09:38:27 +02:00
Laurent Destailleur
091132de2f Signatures of methods createFromClone() has been standardized. All 
methods requires the object User as first parameter.
 2019-04-25 12:11:32 +02:00
Laurent Destailleur
f45462b409 Merge branch 'develop' of https://github.com/dolibarr/dolibarr into develop 2019-04-17 10:39:49 +02:00
Laurent Destailleur
e6ffaeefe5 CSS 2019-04-17 10:39:30 +02:00
ATM john
292d9c38a5 Appli function to links 2019-04-15 00:21:58 +02:00
Francis Appels
d08db86ba1 Fix customer order updateline 2019-04-11 18:55:16 +02:00
Laurent Destailleur
d7f980fda0 NEW Add picto of deletion on mass action combo lists 2019-04-09 01:22:59 +02:00
Laurent Destailleur
7b01e76d2b Fix doxygen 2019-04-08 16:04:15 +02:00
Laurent Destailleur
917b9d69fa Removed the method 4 of GETPOST (to get $_COOKIE). It was not used and 
not recommanded to use in Dolibarr.
 2019-04-08 14:55:31 +02:00
Laurent Destailleur
31963be6a0 Merge pull request #10922 from altatof/cloneorder 
clone of order like in propal (ref_client, contacts)
 2019-03-31 18:25:48 +02:00
Laurent Destailleur
361254a4c0 Fix regression after renamind valdate_invoices 2019-03-31 18:23:54 +02:00
Laurent Destailleur
1b2826f476 Look and feel v10 2019-03-29 13:26:26 +01:00
Christophe Battarel
c9b321ded4 add global conf to createfromclone 2019-03-27 10:32:40 +01:00
Christophe Battarel
f1548bd253 fix objfrom 2019-03-27 10:27:08 +01:00