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

62198 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Laurent Destailleur
df2f73bdc3 Fix quick search on product/services 2017-10-07 20:36:32 +02:00
Laurent Destailleur
e40bffb0d5 Fix bug reported by scrutinizer 2017-10-07 20:21:47 +02:00
Laurent Destailleur
f89676126e Update translation tools 2017-10-07 20:11:35 +02:00
Laurent Destailleur
c771ce524f Fix lose filter 2017-10-07 18:25:04 +02:00
Laurent Destailleur
5d24aa4830 Fix sql 2017-10-07 14:54:31 +02:00
Laurent Destailleur
ad57a8480f Merge pull request #7462 from tysauron/patch-15 
NEW Adding Field "First date of expire" + filter on contract list
 2017-10-07 14:16:31 +02:00
Laurent Destailleur
6271c90904 Update list.php 2017-10-07 14:15:47 +02:00
Laurent Destailleur
42ebb1ce4d Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2017-10-07 14:11:13 +02:00
Laurent Destailleur
af1d2bfffd Standardize code 2017-10-07 14:11:01 +02:00
Laurent Destailleur
7465daa0da Merge pull request #7583 from hregis/develop_admin 
NEW add '$moreatt' parameter in picto_from_langcode function
 2017-10-07 13:45:16 +02:00
Laurent Destailleur
66978a3bb4 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop

Conflicts:
	htdocs/fourn/class/fournisseur.commande.class.php
 2017-10-07 13:44:27 +02:00
Laurent Destailleur
762879b95b Merge pull request #7586 from Dolibarr/scrutinizer-patch-1 
Scrutinizer Auto-Fixes
 2017-10-07 13:39:39 +02:00
Laurent Destailleur
04d110220c Merge pull request #7582 from Oeris/develop-api 
NEW Delete a line of invoice using the REST API
 2017-10-07 13:29:04 +02:00
Laurent Destailleur
1b399dc8dd Update api_invoices.class.php 2017-10-07 13:28:04 +02:00
Laurent Destailleur
b91667e69c Merge pull request #7579 from OPEN-DSI/fix_0003 
New add test dates order for start and end dates of a line of a contract
 2017-10-07 13:16:53 +02:00
Laurent Destailleur
d1ad6e0263 Update card.php 2017-10-07 13:16:39 +02:00
Laurent Destailleur
0a88633f59 Merge pull request #7580 from OPEN-DSI/fix_0004 
Fix concat desc of lines when create contract from proposal or other
 2017-10-07 13:13:44 +02:00
Scrutinizer Auto-Fixer
328d39bc71 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2017-10-07 11:09:31 +00:00
Laurent Destailleur
74deb05527 Clean code. Use constant for status of supplier order process. 2017-10-07 13:04:31 +02:00
Laurent Destailleur
41716281ed Fix demo 2017-10-07 11:44:07 +02:00
Laurent Destailleur
2c126c4164 Fix typo 2017-10-07 03:10:48 +02:00
Laurent Destailleur
6a3be553f7 Start to work on common js part. 2017-10-07 03:08:01 +02:00
Laurent Destailleur
4347bc06a2 do no transform data:image 2017-10-07 02:40:03 +02:00
Laurent Destailleur
3cc48f156f The new website module become wonderfull 2017-10-07 02:29:27 +02:00
Laurent Destailleur
aa3fd067fc Fix regex UNGREEDY 2017-10-06 23:54:45 +02:00
Laurent Destailleur
8e187c2759 Debug module website 2017-10-06 22:49:08 +02:00
Regis Houssin
e0e10ff830 NEW add '$moreatt' parameter in picto_from_langcode function 2017-10-06 20:53:41 +02:00
Neil Orley
925a86b2ba NEW Delete a line of invoice using the REST API 
Adds the ability to delete a line of an invoice using the REST API
Rename a post action with a "verb"
 2017-10-06 20:49:58 +02:00
Neil Orley
3bacb7ce39 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop-api 2017-10-06 20:49:48 +02:00
Laurent Destailleur
de71de61af Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2017-10-06 18:52:38 +02:00
Neil Orley
313a432c33 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop-api 2017-10-06 18:49:23 +02:00
Laurent Destailleur
df38f60617 Export website into zip 2017-10-06 18:29:18 +02:00
KHELIFA
dadd3842a0 Fix concat desc of lines when create contract from proposal or other 2017-10-06 18:01:03 +02:00
KHELIFA
e715a680bf New add test dates order for start and end dates of a line of a contract 2017-10-06 17:58:15 +02:00
Laurent Destailleur
8d47969d29 Merge pull request #7578 from OPEN-DSI/fix_0002 
NEW add a new notification for the signed closed event of a proposal.
 2017-10-06 17:36:23 +02:00
Laurent Destailleur
c7a0f467cc Fix var unknown 2017-10-06 17:03:32 +02:00
Laurent Destailleur
1140016b67 Merge pull request #7575 from hregis/develop_admin 
Fix: for avoid problem with currentcontext
 2017-10-06 16:47:10 +02:00
KHELIFA
88ab3a9cab Add a new notification for the event that has successfully closed a proposal. 2017-10-06 16:15:40 +02:00
Laurent Destailleur
43d85af5ae Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 2017-10-06 15:23:10 +02:00
Laurent Destailleur
d07ec07896 FIX #7554 2017-10-06 15:22:40 +02:00
Regis Houssin
4ea3d27ced Fix: for avoid problem with currentcontext 2017-10-06 15:19:43 +02:00
Laurent Destailleur
ed467aa74b FIX Only modified values must be modified 2017-10-06 15:01:31 +02:00
Laurent Destailleur
1becbb8805 Fix bad date on time spent view 2017-10-06 14:38:33 +02:00
Laurent Destailleur
afc1938676 FIX #7550 2017-10-06 14:28:01 +02:00
Laurent Destailleur
f9d9642340 FIX #6981 2017-10-06 14:07:28 +02:00
Laurent Destailleur
5411699256 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 2017-10-06 13:57:12 +02:00
Laurent Destailleur
8ce723b4c9 FIX #7514 2017-10-06 13:56:54 +02:00
Laurent Destailleur
19adbaf84b Fix url to explorer no more working 2017-10-06 13:36:29 +02:00
Laurent Destailleur
777486d74c Keep usage of function dol_hash to encrypt a non encrypted data 2017-10-06 13:13:51 +02:00
Laurent Destailleur
2d549a6191 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2017-10-06 13:09:42 +02:00