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

3785 Commits

Author SHA1 Message Date
Laurent Destailleur
d925e552ca Merge pull request #2709 from atm-alexis/3.7 
FIX event not linked to contact on creation
 2015-04-24 21:23:50 +02:00
Alexis Algoud
7d3482036d FIX event not linked to contact on creation 2015-04-24 17:40:53 +02:00
Gauthier
58008cef94 NEW : display linked object in edit mode when we create an event from an order, propal... 2015-04-23 16:28:29 +02:00
jean
8006edc278 correct issue 2589 getting user signature in script, when user is sended 
through a script parameter
 2015-04-18 16:39:53 +02:00
Laurent Destailleur
584ca971b0 Fix #2600 2015-04-13 01:32:53 +02:00
Laurent Destailleur
16a620f926 Fix: Deadlock situation (when order were canceled, no way to make 
nothing on it)
Fix: Don't know how I forgot this events into trigger system.
 2015-04-01 16:07:22 +02:00
Florian HENRY
26c29216d9 syntax 2015-03-26 16:55:13 +01:00
Laurent Destailleur
895b2c6e9c Fix bad merge 2015-03-13 14:37:27 +01:00
Laurent Destailleur
0ff2a0ad9f Merge branch 'bug-1825-37' of https://github.com/marcosgdf/dolibarr into 
marcosgdf-bug-1825-37

Conflicts:
	htdocs/comm/action/index.php
 2015-03-11 02:26:01 +01:00
Maxime Kohlhaas
154e1a7991 Merge branch '3.6' of github.com:Dolibarr/dolibarr into 3.6 2015-03-10 15:14:25 +01:00
Maxime Kohlhaas
978dc8170d Fix : display proposal date on proposal list 2015-03-10 14:56:58 +01:00
Laurent Destailleur
9c12c325db Fix regression into enable/disable external calendars 2015-03-05 11:46:03 +01:00
Laurent Destailleur
6c1c1fd691 Merge remote-tracking branch 'origin/3.6' into 3.7 
Conflicts:
	htdocs/comm/action/index.php
	htdocs/core/lib/agenda.lib.php
	htdocs/fourn/paiement/fiche.php
 2015-03-05 11:35:39 +01:00
Marcos García de La Fuente
c9b3cab22b Mytasks is not clickable 2015-03-05 10:22:33 +01:00
Marcos García de La Fuente
d549030078 Fixed bug with hide/show checkboxes reported by Ruben Almeida (aruben) 2015-03-05 10:20:32 +01:00
Marcos García de La Fuente
41c55d1913 Better fix for bug-1825. There are actually a lot to things to escape and escaped methods can make conflict with similar names so it is better to make a md5 to have a unique value 2015-03-04 11:55:17 +01:00
Laurent Destailleur
79023cddb0 Fix external calendar for users were not visible if no global calendar 
was set.
 2015-03-02 17:34:50 +01:00
Laurent Destailleur
3475433eaf Fix: the bank information were visible into pdf but were not using 
correct setup to decide which bank to show.
 2015-03-02 02:59:59 +01:00
Marcos García de La Fuente
7876238823 Fixed bug with hide/show checkboxes reported by Ruben Almeida (aruben) 
When an external calendar was called "mytasks", Dolibarr events were also hidden too.
 2015-03-02 01:36:27 +01:00
Laurent Destailleur
4bde7e9f51 Fix: Missing error management 2015-02-26 14:25:30 +01:00
Laurent Destailleur
fe7889e266 Fix trigger to insert lines where called when inserting line but also 
when cloning parent object, making no way to know when to use them or
not. I introduced a context to allow code to know that and do not
triggers twice.
 2015-02-26 13:19:19 +01:00
Laurent Destailleur
41a74c62e2 Fix trigger to insert lines where called when inserting line but also 
when cloning parent object, making no way to know when to use them or
not. I introduced a context to allow code to know that and do not
triggers twice.
 2015-02-26 13:03:17 +01:00
Laurent Destailleur
386eaf0911 Fix: bad sql request 2015-02-26 12:11:31 +01:00
Laurent Destailleur
76640b6b77 Fix removed warning 2015-02-25 15:01:25 +01:00
Laurent Destailleur
938936b8f2 Merge remote-tracking branch 'origin/3.6' into 3.7 
Conflicts:
	htdocs/core/lib/agenda.lib.php
	htdocs/core/lib/functions.lib.php
 2015-02-20 22:51:47 +01:00
Laurent Destailleur
774389940e Merge remote-tracking branch 'origin/3.6' into 3.7 
Conflicts:
	ChangeLog
	htdocs/comm/propal/list.php
	htdocs/compta/bank/ligne.php
	htdocs/compta/resultat/clientfourn.php
	htdocs/compta/salaries/fiche.php
	htdocs/core/lib/functions.lib.php
	htdocs/fourn/facture/paiement.php
 2015-02-18 23:51:41 +01:00
Laurent Destailleur
e7d95f553b Merge remote-tracking branch 'origin/3.5' into 3.6 2015-02-18 23:43:22 +01:00
Laurent Destailleur
2d2930b421 Merge pull request #2348 from tiaris/3.7_actionclassbug 
fetch must contain an left join on c_actioncom for correct function
 2015-02-18 23:02:44 +01:00
Laurent Destailleur
4963555669 Merge branch 'misc' of https://github.com/marcosgdf/dolibarr into 
marcosgdf-misc

Conflicts:
	htdocs/barcode/codeinit.php
 2015-02-18 22:54:02 +01:00
jean
1f31ff338c correction for fetch sql 2015-02-11 14:39:32 +01:00
Laurent Destailleur
ddb95e5765 Merge remote-tracking branch 'origin/3.6' into 3.7 
Conflicts:
	htdocs/comm/mailing/fiche.php
	htdocs/compta/paiement/liste.php
	htdocs/contact/class/contact.class.php
	htdocs/core/lib/tax.lib.php
	htdocs/core/modules/expedition/doc/pdf_merou.modules.php
	htdocs/core/modules/expedition/doc/pdf_rouget.modules.php
	htdocs/langs/en_US/agenda.lang
	htdocs/webservices/server_contact.php
 2015-02-10 21:33:43 +01:00
jean
2820bd24ac fetch must contain an left join on c_actioncom for correct function 2015-02-10 16:03:31 +01:00
Marcos García de La Fuente
023175b9f1 PHPDoc and misc fixes for several folders 2015-02-10 11:38:13 +01:00
Marcos García de La Fuente
0d150b1d32 Removed unused code, misc corrections and corrected PHPDoc problems. 2015-02-10 10:25:59 +01:00
Christophe Battarel
3940abe7c1 FIX: select DISTINCT for natural search on proposal list (in the same 
way it's done in invoices list)
 2015-02-07 10:48:03 +01:00
Laurent Destailleur
20121c2fbe Fix pb into date management. 
Added phpunit to avoid this in future.
 2015-02-03 11:25:51 +01:00
Laurent Destailleur
75f451ccc7 Fix class not found 2015-02-03 08:59:57 +01:00
Marcos García de La Fuente
0c63644038 Fix: [ bug #1819 ] SQL error when searching for an invoice payment 2015-02-01 13:26:30 +01:00
Laurent Destailleur
87b75126aa Fix missing set into specimen 2015-01-31 16:52:34 +01:00
Laurent Destailleur
ffde00de81 Fixed date change was lost when changing event assignement. 2015-01-26 10:31:41 +01:00
Laurent Destailleur
8fb6ade27a Fix drag and drop in agenda view 2015-01-25 17:49:11 +01:00
Laurent Destailleur
ad68b3ca6c Fixed approve during validation if user has permission 
Fixed error management
Fixed rendering country must be same for all tabs.
 2015-01-25 00:59:46 +01:00
Laurent Destailleur
5c5ff72ecd Merge remote-tracking branch 'origin/3.6' into 3.7 
Conflicts:
	ChangeLog
	htdocs/adherents/fiche.php
	htdocs/comm/fiche.php
	htdocs/comm/mailing/fiche.php
	htdocs/comm/propal.php
	htdocs/comm/propal/class/propal.class.php
	htdocs/commande/class/commande.class.php
	htdocs/commande/fiche.php
	htdocs/compta/facture.php
	htdocs/compta/paiement.php
	htdocs/core/class/html.formcompany.class.php
	htdocs/core/tpl/login.tpl.php
	htdocs/expedition/fiche.php
	htdocs/fourn/commande/fiche.php
	htdocs/fourn/facture/fiche.php
	htdocs/fourn/facture/paiement.php
	htdocs/fourn/fiche.php
	htdocs/main.inc.php
	htdocs/product/fournisseurs.php
	htdocs/resource/card.php
 2015-01-18 17:13:42 +01:00
Laurent Destailleur
7c5927ef93 Merge branch 'bug-1796' of https://github.com/marcosgdf/dolibarr into 
marcosgdf-bug-1796

Conflicts:
	ChangeLog
 2015-01-18 15:08:49 +01:00
Laurent Destailleur
b3e216b8f1 Merge branch 'bug-1787' of https://github.com/marcosgdf/dolibarr into 
marcosgdf-bug-1787

Conflicts:
	ChangeLog
	htdocs/comm/propal.php
 2015-01-18 15:06:54 +01:00
Laurent Destailleur
ef802d9c39 Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.7 
Conflicts:
	htdocs/comm/action/class/actioncomm.class.php
 2015-01-18 12:31:01 +01:00
Laurent Destailleur
6a294eb02a Fixed: Better fix for backward compatibility 2015-01-18 12:29:55 +01:00
Laurent Destailleur
012c571a6c Fixed: Backward compatibility 2015-01-18 11:50:53 +01:00
Marcos García de La Fuente
7f59cf9194 Fix: [ bug #1787 ] Incorrect behaviour of doActions hook 2015-01-17 19:28:27 +01:00
Marcos García de La Fuente
ed839114ab Fixed loading of external numeration modules in FactureFournisseur and Propal 2015-01-17 18:42:19 +01:00
Marcos García de La Fuente
a64084308d Fix: [ bug #1804 ] SQL error when sending email without addresee 2015-01-17 18:12:43 +01:00
Laurent Destailleur
d16ce7eb96 Fix: Bad var 2015-01-15 02:42:41 +01:00
Laurent Destailleur
362167f319 Fixed: Export was not using user assigned 2015-01-15 02:32:15 +01:00
Laurent Destailleur
ba49cce47a Fix: The filter into event views on user must be done on assigned 
resource, not only owner.
 2015-01-15 02:06:04 +01:00
Laurent Destailleur
806477977d Fix: css 2015-01-14 13:51:21 +01:00
Laurent Destailleur
4ee308c77b Fixed: Filter lost after search on date 2015-01-06 20:58:23 +01:00
Laurent Destailleur
033757aafd Merge remote-tracking branch 'origin/3.6' into 3.7 
Conflicts:
	htdocs/commande/fiche.php
	htdocs/compta/facture.php
 2015-01-06 00:33:28 +01:00
Laurent Destailleur
337d055872 Merge pull request #2199 from altatof/3.6 
FIX: dont remove price ht if it is forced (ie: calculated by margin rate and cost price, or by external module)
 2015-01-06 00:10:08 +01:00
Marcos García de La Fuente
86100758ff Miscellaneous corrections 2014-12-28 20:13:15 +01:00
Christophe Battarel
1ab6955494 FIX: dont remove price ht if it is forced (ie: calculated by margin rate 
and cost price, or by external module)
 2014-12-27 11:27:41 +01:00
Laurent Destailleur
657fc1b91c Merge remote-tracking branch 'origin/3.6' into 3.7 
Conflicts:
	ChangeLog
	htdocs/comm/fiche.php
	htdocs/core/lib/functions2.lib.php
	htdocs/fourn/fiche.php
	htdocs/langs/fr_FR/compta.lang
	htdocs/projet/element.php
	htdocs/projet/tasks/contact.php
	htdocs/projet/tasks/time.php
 2014-12-26 04:44:15 +01:00
Laurent Destailleur
5215b1e641 Merge pull request #2186 from marcosgdf/bug-575 
Fix [ bug #575 ] GED doesn't works if there is "/" in a mask
 2014-12-26 04:02:01 +01:00
Marcos García de La Fuente
aec1bdb3c4 Fixed [ bug #1766 ] PHP Warning when adding a service to a supplier invoice 2014-12-25 23:08:07 +01:00
Marcos García de La Fuente
1f00794c98 Fixed bug which didn't show documents in auto GED when an object had '/' in its ref 2014-12-25 21:47:39 +01:00
Laurent Destailleur
b7dbb1e9cd Fixed: Do not show disabled user when creating a new event. 2014-12-23 17:46:30 +01:00
Laurent Destailleur
9e2f57007b Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.7 2014-12-23 12:59:54 +01:00
Laurent Destailleur
acf7b9f130 Because this is a legal issue (OPCA), i added the hidden constant for 
3.7: WORKFLOW_PROPAL_CAN_CLASSIFY_BILLED_WITHOUT_INVOICES => Button
"Classified Billed" is visible on proposal even if there is no invoice
linked to proposal.
Fixed: Also fix get list of invoice that report too many data.
 2014-12-23 12:59:34 +01:00
Marcos García de La Fuente
3212fd2b27 Fix: [ bug #1649 ] Cancel button of several thirdparty actions, does the same thing as modify 2014-12-23 11:00:18 +01:00
Frédéric FRANCE
6f4ba2552d Typo on conf variable 2014-12-21 10:14:51 +01:00
Laurent Destailleur
5f8919c857 Update translation 2014-12-08 23:59:33 +01:00
Laurent Destailleur
1e8e7474d8 Fixed: specimen init did not include new vars of 3.7 2014-12-07 21:22:43 +01:00
Laurent Destailleur
a59ac280bc Doxygen 2014-12-07 02:19:57 +01:00
Laurent Destailleur
0459477097 Fix: Miscellaneous fixes for multicompany 2014-12-06 14:41:56 +01:00
Laurent Destailleur
bff65fc6b4 Fix: starting with var with always same color 2014-12-05 01:25:18 +01:00
Laurent Destailleur
83122ebe1e Fixed a lot of bugs into PrintIPP module. Seems to be stable enough now 
for release.
 2014-12-04 13:20:56 +01:00
Laurent Destailleur
f3584fa211 Fixed: Button at wrong place 
Fixed: Must use style css span badge for number of files
 2014-12-01 00:53:15 +01:00
Laurent Destailleur
3fe2db6c8d Try to find a solution to fight against spam sending from dolibarr when 
phpmail is set.
No time to find a better solution so i add just a hidden option to
disable phpmail function.
 2014-11-29 13:50:41 +01:00
Laurent Destailleur
278cdf72d6 Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.7 2014-11-29 12:41:26 +01:00
Laurent Destailleur
c7420662e6 Fixed: Module for target emailing must not be visible when modules is 
disabled.
 2014-11-29 12:40:45 +01:00
Laurent Destailleur
df9a6dae6c Merge remote-tracking branch 'origin/3.6' into 3.7 
Conflicts:
	htdocs/core/modules/livraison/pdf/pdf_typhon.modules.php
	htdocs/core/tpl/objectline_create.tpl.php
	htdocs/fichinter/fiche.php
 2014-11-28 02:20:01 +01:00
Laurent Destailleur
dc1c98734e Fixed: Option specific to a module should start with module name 2014-11-28 00:21:52 +01:00
Laurent Destailleur
f9953d52f6 Merge pull request #2091 from frederic34/patch-3 
Fix 1721 Missing translation on proposal creation
 2014-11-28 00:16:44 +01:00
Frédéric FRANCE
f769295999 Update apercu.php 2014-11-27 21:03:01 +01:00
Frédéric FRANCE
e179e7d5a5 Fix 1655 Proposal amount not computed in preview 2014-11-26 17:24:26 +01:00
Francis Appels
b1a4b8e7d0 Fix: [ bug #1624 ] POS set buy price for margin 
Use lowest buying price for margin when selling with POS or external
module. A POS user does not worry about suppliers.
 2014-11-25 21:20:13 +01:00
Frédéric FRANCE
81f467661e Update propal.php 2014-11-24 20:58:46 +01:00
Frédéric FRANCE
01e6d9fc12 Update /comm/prospect/list.php 2014-11-23 17:45:00 +01:00
Frédéric FRANCE
627e3e0a2b Update /comm/actions/listactions.php 2014-11-23 17:44:57 +01:00
Frédéric FRANCE
e6da4a2518 Update /comm/list.php 2014-11-23 17:43:32 +01:00
Laurent Destailleur
e8b2206629 Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.7 2014-11-22 15:57:33 +01:00
Laurent Destailleur
86a3a4f618 Merge branch '1680' of github.com:aspangaro/dolibarr into aspangaro-1680 
Conflicts:
	htdocs/comm/propal/list.php
 2014-11-22 15:57:06 +01:00
Laurent Destailleur
e6e5cb471d Merge pull request #2040 from aspangaro/1681 
#1681 Clear sort filter works partially in customers list
 2014-11-22 15:54:57 +01:00
Laurent Destailleur
6c7bab8d8c Merge pull request #2045 from frederic34/patch-4 
#1682 Date is missing in proposals list
 2014-11-22 15:50:50 +01:00
Laurent Destailleur
86f2f191ea Merge pull request #2046 from frederic34/patch-5 
#1683 Can't clear sort filter on proposals list
 2014-11-22 15:50:37 +01:00
Laurent Destailleur
f7206c2a52 Fixed: [ bug #1578 ] Cannot create proposal by copy of another one 2014-11-19 23:10:30 +01:00
Laurent Destailleur
c8fe538de2 Fix: Filter were lost 2014-11-18 14:37:19 +01:00
Laurent Destailleur
c077998ff8 Fix: Line not visible when there is a lot of lines. 2014-11-18 14:37:14 +01:00
Frédéric FRANCE
5536abecf7 #1683 Can't clear sort filter on proposals list 2014-11-17 23:57:01 +01:00
Frédéric FRANCE
f2eda0629b #1682 Date is missing in proposals list 2014-11-17 23:54:39 +01:00
aspangaro
de7a38417f #1680 Clear sort filter works partially in prospects list 2014-11-17 21:45:29 +01:00