lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
49,118 Commits 43 Branches 150 Tags 886 MiB
2a8ebcefcc
Commit Graph

49118 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Laurent Destailleur
1411772c81 Fix sql error 2015-06-03 17:07:46 +02:00
Laurent Destailleur
d109c78c6b Fix label of project was not visible 2015-06-03 16:59:48 +02:00
Laurent Destailleur
76865c00b5 NEW The line where mouse is over can be highlight with option 
THEME_ELDY_USE_HOVER (on by default)
 2015-06-03 16:49:22 +02:00
Laurent Destailleur
4adeb8980d NEW Add ref and label of project into export 2015-06-03 16:40:02 +02:00
Laurent Destailleur
f7eaf35d30 NEW When creating order, proposal or invoice from thirdparty card, the 
project is asked during creation. A link to create project if it does
not exists is also available.
NEW Uniformize form creation of proposal to add public and private notes
during creation like done for order and invoice.
 2015-06-03 11:55:39 +02:00
aspangaro
3461a8712a New: Add object of the company - Needed for donation 2015-06-03 06:48:15 +02:00
aspangaro
aa9951948b New: Add logo cerfa in common themes files 2015-06-03 06:02:52 +02:00
aspangaro
bde91633da Fix: input of french article is disabled by default 2015-06-03 06:01:05 +02:00
aspangaro
d28a56c8ac Correct travis 2015-06-03 05:49:43 +02:00
aspangaro
ef88a04f93 Fix: Donation error on admin tab 2015-06-02 20:41:02 +02:00
Gauthier
3f4ded4780 FIX : When we clone a propal, if it has a project which is not assigned to a third, it was not on new propal because fk_project was always set to empty string if new propal is for another third. 2015-06-02 16:06:03 +02:00
Raphaël Doursenaud
9b747a12aa Fixed some coding style issues 2015-06-02 15:13:52 +02:00
Florian HENRY
061e675b51 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-06-02 13:02:06 +02:00
Florian HENRY
3b3319e435 Add contrl invoice supplier already exists (as it is done on customer 
invoice)
 2015-06-02 13:01:51 +02:00
Florian HENRY
fb29fa486a FIX : total amount in tpl linked object are not reset 2015-06-02 11:20:08 +02:00
Florian HENRY
bdaf83a653 Merge branch '3.6' of git@github.com:Dolibarr/dolibarr.git into 3.6 2015-06-02 08:42:13 +02:00
Florian HENRY
3f1613197e FIX : If supplier invoice block linked element is display after other 
block total HT amount is not reset to 0 and sum other block (like
customer orders values)
 2015-06-02 08:41:42 +02:00
Laurent Destailleur
912358f731 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-06-01 21:38:13 +02:00
Laurent Destailleur
acd693b513 Fix phpcs 2015-06-01 21:37:09 +02:00
Laurent Destailleur
6e72d3c8cc FIX Export of tags for contact and member 2015-06-01 21:34:21 +02:00
Laurent Destailleur
6af35e5cee Merge pull request #2822 from GPCsolutions/showbugtracklink 
NEW A link to the bugtracker can be enabled in the GUI
 2015-06-01 20:54:12 +02:00
Arnaud Aujon
ed657d2bdf hopefully fix travis errors 2015-06-01 20:39:51 +02:00
Arnaud Aujon
9bd32d7bf6 Merge remote-tracking branch 'upstream/develop' into 3.7-webservices-fix 2015-06-01 20:10:51 +02:00
Arnaud Aujon
56a2942503 Merge branch '3.7-webservices-fix' of https://github.com/aaujon/dolibarr into 3.7-webservices-fix 2015-06-01 20:05:36 +02:00
Laurent Destailleur
4f75ab79db Prepare 3.7.2 2015-06-01 16:32:33 +02:00
Laurent Destailleur
f0257d02b5 Minor fix 2015-06-01 16:31:25 +02:00
Laurent Destailleur
d01a777b3e Merge pull request #2761 from tiaris/3_7_picturepath_script 
FIX add a script for migrating pictures of products
 2015-06-01 16:17:13 +02:00
Laurent Destailleur
9ed5d817c4 Merge pull request #2936 from atm-gauthier/3.7 
FIX : When we automatically create an order from a proposal with workf…
 2015-06-01 16:15:37 +02:00
Laurent Destailleur
cc7f2518b6 Merge pull request #2937 from atm-ph/fix_target_list_emailing 
FIX : when mailing is deleted, the targets list was kept in database
 2015-06-01 16:13:24 +02:00
Arnaud Aujon
3099e2acc4 fix travis issues again 2015-06-01 14:15:09 +02:00
Laurent Destailleur
c9d63238ca Add fields at bank account description to manage corretly sepa 
generation.
 2015-06-01 13:19:02 +02:00
Arnaud Aujon
0c66c9745e fix travis error 2015-06-01 13:04:33 +02:00
phf
0523f226cf FIX : when mailing is deleted, the targets list was kept in database 2015-06-01 12:29:10 +02:00
Gauthier
cf4308aa3b FIX : When we automatically creta an order from a proposal with workflow module, if some extrafields of propal don't exist in order object, insertExtraFields() function tries to insert extrafields in unexistant column of commande_extrafields table. 2015-06-01 11:24:30 +02:00
Raphaël Doursenaud
ecd5ebcb44 Member type ref is not deprecated 2015-06-01 11:10:52 +02:00
Raphaël Doursenaud
ea798c2315 Qual: deprecate dol_json_encode() and dol_json_decode() 
PHP > 5.3 supports json_encode() and json_decode() natively
 2015-06-01 11:00:11 +02:00
Raphaël Doursenaud
3f9270ea78 Qual: added deprecation hinting 
Added deprecation hinting for class properties
Added syslog warning events for deprecated functions, methods and/or their parameters
Added hinting for some constants
 2015-06-01 11:00:11 +02:00
Raphaël Doursenaud
a24e4fec6c NEW A link to the bugtracker can be enabled in the GUI 2015-06-01 10:46:56 +02:00
Laurent Destailleur
9753097731 Prepare 3.7.1 2015-05-31 18:45:01 +02:00
Laurent Destailleur
e9687cbc4f Fix the amount for entry price must use the format dedicated to amount. 2015-05-31 18:23:11 +02:00
Laurent Destailleur
227f2842c2 Prepare version 3.7.1 2015-05-31 18:03:24 +02:00
Laurent Destailleur
7d9856f3d8 Update doc 2015-05-31 17:52:32 +02:00
Laurent Destailleur
523b04a315 Work on finishing 2015-05-31 17:31:15 +02:00
Laurent Destailleur
3588d73c8e Fix css 2015-05-31 16:36:11 +02:00
Laurent Destailleur
1b681510a5 NEW Use new select2 component for juridical status, country and state 
selection.
 2015-05-31 12:25:33 +02:00
Laurent Destailleur
19694710b2 Keep this constant visible 2015-05-31 12:24:23 +02:00
Laurent Destailleur
01aad8516d Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	htdocs/adherents/list.php
	htdocs/compta/dons/card.php
	htdocs/compta/dons/class/don.class.php
	htdocs/contact/list.php
	htdocs/contrat/list.php
	htdocs/core/class/html.form.class.php
	htdocs/core/lib/security.lib.php
	htdocs/main.inc.php
	htdocs/product/stock/massstockmove.php
	htdocs/public/test/test_arrays.php
	htdocs/public/test/test_forms.php
	htdocs/societe/societe.php
 2015-05-31 03:30:38 +02:00
Laurent Destailleur
36de50f60d Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.7 2015-05-31 03:07:36 +02:00
Laurent Destailleur
3cfe4dc86e Sync language files 2015-05-31 03:07:17 +02:00
Laurent Destailleur
7c4c096310 Fix typo 2015-05-31 02:33:03 +02:00