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

1239 Commits

Author SHA1 Message Date
Abbes Bahfir
7d25311ce5 New : Link to create new element on linked fields 2018-10-08 10:59:01 +01:00
atm-quentin
6a8092dfae NEW entete reception card 2018-10-05 16:21:50 +02:00
Frédéric FRANCE
2af15ee932
Update commonobject.class.php 2018-09-30 17:59:04 +02:00
Laurent Destailleur
f667270d4d Add option to not load all object and fix so linkedObjectsIds has same 
content than linkedObjects
 2018-09-28 17:38:29 +02:00
Laurent Destailleur
9630c7b5c7
Merge pull request #9614 from grandoc/new_branch_25_09_2018 
Add some code comment
 2018-09-27 09:31:19 +02:00
Laurent Destailleur
2b8ccc0c81 FIX Link template invoice to contract 2018-09-27 01:53:12 +02:00
Laurent Destailleur
9123329800 FIX Link template invoice to contract 2018-09-26 23:44:27 +02:00
Philippe GRAND
746d73b8e6 Add some code comment 2018-09-25 17:26:57 +02:00
Laurent Destailleur
61f5a2e899
Merge pull request #9533 from frederic34/trimParameters 
trimParameters function
 2018-09-18 15:04:32 +02:00
Laurent Destailleur
0bf540b3c1 Fix regression in edition of date 2018-09-17 09:17:11 +02:00
Frédéric FRANCE
b950043618
trimParameters 2018-09-16 15:16:08 +02:00
Laurent Destailleur
ab0f842db6 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-09-16 12:55:44 +02:00
Laurent Destailleur
cc4fbfc3ef Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 
Conflicts:
	htdocs/core/class/commonobject.class.php
 2018-09-16 12:54:39 +02:00
Laurent Destailleur
eebd329c7c Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/modules/DolibarrModules.class.php
	htdocs/core/modules/modAgenda.class.php
	htdocs/core/modules/modFacture.class.php
	htdocs/langs/en_US/admin.lang
	htdocs/langs/en_US/main.lang
	htdocs/stripe/transaction.php
 2018-09-16 09:50:13 +02:00
Frédéric FRANCE
987fdbe73c
Merge remote-tracking branch 'upstream/develop' into patch-6 2018-09-12 21:29:41 +02:00
Jean-Marie Arsac
345c24990e Correction of variable name 2018-09-11 20:51:54 +02:00
Jean-Marie Arsac
2f2dff8155 Convert localized numeric extrafields value before inserting 
- add 'double' case in insertExtraFields and updateExtraFields to to convert localized value using price2num()
 2018-09-11 14:57:31 +02:00
Regis Houssin
43ac51b44c FIX remove debug 2018-09-10 10:11:07 +02:00
Regis Houssin
8699866062 FIX better compatibility with multicompany 2018-09-10 10:08:04 +02:00
Frédéric FRANCE
8249756726
replace select_date 2018-09-09 10:40:00 +02:00
Frédéric FRANCE
65b74ad30f
Merge remote-tracking branch 'upstream/develop' into camelCaps2 2018-09-04 20:48:35 +02:00
Frédéric FRANCE
04c1a7d4af
move phpcs:ignore 2018-09-02 13:38:11 +02:00
Philippe GRAND
3de16a145e Standardize and update code 2018-09-02 11:08:41 +02:00
Laurent Destailleur
c8912d6a4f
Merge pull request #9242 from frederic34/camelCaps 
mark non camelCaps function
 2018-09-01 15:37:56 +02:00
Laurent Destailleur
359eebbbec Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-09-01 14:26:48 +02:00
Laurent Destailleur
08bc81a7ab
Merge pull request #9370 from joseplluis/patch-5 
NEW optional param to show a specific extrafield
 2018-09-01 14:24:23 +02:00
Laurent Destailleur
bc71aef7b4 Code comment 2018-09-01 14:24:02 +02:00
Frédéric FRANCE
57fb3dc2f4
Merge remote-tracking branch 'upstream/develop' into camelCaps 2018-09-01 13:52:51 +02:00
Josep Lluís
78c0aa437f
NEW optional param to show a specific extrafield 
Using params in showOptionals you can show only a specific extrafield in a personalized form or canvas.
For example: print $object->showOptionals($extrafields, 'view', array('onlykey'=>'myfield_5'));
 2018-08-31 17:16:27 +02:00
Frédéric FRANCE
6aee680a4f
PSR2 ClassDeclaration 2018-08-29 22:06:05 +02:00
Frédéric FRANCE
b03f4004ea
PSR2 FunctionClosingBrace 2018-08-29 21:25:22 +02:00
Frédéric FRANCE
cbdc669ba9
Merge remote-tracking branch 'upstream/develop' into camelCaps 2018-08-29 18:45:36 +02:00
Laurent Destailleur
7bf48b8d77 Fix date_start and date_end not saved on supplier invoice 
Conflicts:
	htdocs/core/class/commonobject.class.php
	htdocs/fourn/class/fournisseur.facture.class.php
	htdocs/fourn/facture/card.php
 2018-08-29 17:26:41 +02:00
Laurent Destailleur
98356c6ed0 Fix date_start and date_end not saved on supplier invoice 2018-08-29 17:03:18 +02:00
Frédéric FRANCE
fe4260a014
Merge remote-tracking branch 'upstream/develop' into camelCaps 2018-08-28 09:34:53 +02:00
Laurent Destailleur
7219bac0b2
Merge pull request #9168 from frederic34/trimtrailing 
Trimtrailing
 2018-08-28 02:30:02 +02:00
Philippe GRAND
215677c972 Standardize and update code 2018-08-23 18:17:09 +02:00
Philippe Grand
e09f7bedd0
Update commonobject.class.php 2018-08-23 09:57:19 +02:00
Philippe GRAND
504b0e3d16 Update and standardize code 2018-08-22 18:34:50 +02:00
Frédéric FRANCE
6b6daf178f
Merge remote-tracking branch 'upstream/develop' into camelCaps 2018-08-21 20:57:58 +02:00
Frédéric FRANCE
aba69b94b2
Merge remote-tracking branch 'upstream/develop' into trimtrailing 2018-08-21 14:03:02 +02:00
Frédéric FRANCE
39462742e2
Merge remote-tracking branch 'upstream/develop' into camelCaps 2018-08-16 08:17:55 +02:00
Laurent Destailleur
b515511ad6
Merge branch 'develop' into FunctionDeclaration 2018-08-16 00:52:55 +02:00
Laurent Destailleur
5c712a6cd3
Merge branch 'develop' into trimtrailing 2018-08-16 00:47:09 +02:00
Frédéric FRANCE
7bb781eea8
function declaration 2018-08-15 14:28:34 +02:00
Frédéric FRANCE
5146ab9177
trim 2018-08-14 15:34:44 +02:00
Frédéric FRANCE
a0a6afc224
return comment 2018-08-14 12:23:10 +02:00
Frédéric FRANCE
850ac34020
mark non camelCaps function 2018-08-13 17:26:32 +02:00
Laurent Destailleur
9fc5d39d07 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-08-12 20:09:36 +02:00
Laurent Destailleur
dc8c4402ee Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-08-12 20:09:22 +02:00
Laurent Destailleur
2f559a7edb
Merge pull request #9199 from atm-quentin/FIX_hook_update_price 
NEW Add hook changeRoundingMode in update_price
 2018-08-12 18:17:52 +02:00
Laurent Destailleur
3d4d42462c Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2018-08-12 16:30:21 +02:00
Laurent Destailleur
12e21b4886 FIX update extrafields 2018-08-12 16:29:26 +02:00
Laurent Destailleur
61d7629ab1 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/comm/propal/list.php
 2018-08-08 17:44:22 +02:00
Laurent Destailleur
8d54df4263 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 
Conflicts:
	htdocs/core/modules/commande/doc/pdf_einstein.modules.php
	htdocs/core/modules/facture/doc/pdf_crabe.modules.php
	htdocs/core/modules/propale/doc/pdf_azur.modules.php
 2018-08-08 17:31:23 +02:00
ATM-Nicolas
5b15e688af FIX : PHP warning, undefined index notnull 2018-08-07 09:38:18 +02:00
atm-quentin
6662bf05ba FIX hook on update price AND fix id on line 2018-08-03 11:47:43 +02:00
Laurent Destailleur
508133b336 Clean code 2018-07-17 13:04:54 +02:00
Laurent Destailleur
12c43d7722 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-07-03 12:33:17 +02:00
Regis Houssin
9709207a4f Fix: superadmin can show all users in master entity 2018-07-02 10:18:16 +02:00
Regis Houssin
df718cca5c Fix: better sql request with multicompany transverse mode 2018-07-02 10:09:56 +02:00
Regis Houssin
df55bee8ae Fix: missing "$disableremove" global 2018-07-01 15:33:10 +02:00
Laurent Destailleur
ee2d543781
Merge pull request #8837 from delcroip/patch-modulebuilder-supportsellist 
NEW support selllist in the  module builder
 2018-06-30 15:33:17 +02:00
Laurent Destailleur
ac758e02a9 Fix error message with old usage of childtables 2018-06-27 01:32:54 +02:00
Laurent Destailleur
668608db5e Fix error message with old usage of childtables 2018-06-26 18:26:44 +02:00
Laurent Destailleur
00165871bd CSS 2018-06-23 15:10:44 +02:00
Laurent Destailleur
4b84b7ccf2
Merge pull request #8926 from fappels/develop_fix_setvaluefrom 
FIX commonobject setValueFrom trigger
 2018-06-13 20:50:26 +02:00
Laurent Destailleur
50aa674ebc Fix support of 'help' field property. Fix bad td closing. 2018-06-13 13:36:40 +02:00
fappels
a9f60bcdac fix travis 2018-06-06 22:04:12 +02:00
fappels
81ef355b65 Fix trigger on setValueFrom 
Load updated values into object for trigger.
 2018-06-06 17:10:46 +02:00
Laurent Destailleur
87d073b5cd Fix conflict with external ticketsup module 2018-06-04 21:49:29 +02:00
Laurent Destailleur
b094ae953e Better log 2018-06-01 17:20:49 +02:00
Laurent Destailleur
7eea70ebc8 FIX #8858 #8860 Backport better compatibility fix 2018-05-29 10:13:34 +02:00
Frédéric FRANCE
e2a557aadd
limit length of lines to 500 chars 2018-05-27 15:04:12 +02:00
patrick Delcroix
ef37fccef4 Merge origin/patch-modulebuilder-supportsellist into patch-modulebuilder-supportsellist 2018-05-26 23:43:17 +02:00
patrick Delcroix
adda3144bc Fix Show double(x,y) fields 2018-05-26 23:39:36 +02:00
Laurent Destailleur
bcbe28d802 Code comment 2018-05-25 12:48:33 +02:00
Laurent Destailleur
f3713844ee
Update commonobject.class.php 2018-05-25 12:38:01 +02:00
Laurent Destailleur
770e97431b
Update commonobject.class.php 2018-05-25 12:36:38 +02:00
Laurent Destailleur
86b1904a41
Update commonobject.class.php 2018-05-25 12:33:30 +02:00
Laurent Destailleur
520ce99e56
Merge pull request #8828 from bgenere/develop 
FIX : showOptionals function is now consistent with template Extrafield_view.tpl.php
 2018-05-25 11:17:45 +02:00
Laurent Destailleur
a3bea8d298
Update commonobject.class.php 2018-05-25 11:17:01 +02:00
Laurent Destailleur
fbcaf8872b
Merge pull request #8808 from atm-john/Add_table_thead_and_tbody 
Add table thead and tbody for object lines
 2018-05-25 10:42:26 +02:00
delcroix Patrick
3158fdc551
Update commonobject.class.php 2018-05-24 21:20:34 +02:00
delcroix Patrick
c85d216f8e
Merge branch 'develop' into patch-modulebuilder-supportsellist 2018-05-22 22:24:20 +02:00
patrick Delcroix
29d26b6e89 New: support sellist in modulebuilder 2018-05-22 22:16:25 +02:00
patrick Delcroix
2ccaf1ad95 New: support sellist in modulebuilder 2018-05-22 22:00:20 +02:00
Laurent Destailleur
1b20ec05d1 Save translation 2018-05-21 19:37:47 +02:00
Laurent Destailleur
c141c3ecfd Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-05-21 19:35:26 +02:00
Laurent Destailleur
05c2f206ff Fix missing lang 2018-05-21 19:35:12 +02:00
bgenere
227539d647 FIX : showOptionals function is now consistent with template 
Extrafield_view.tpl.php for date and datetime fields

The jdate function is not called when not needed.
 2018-05-21 16:55:35 +02:00
John
8710cf570d Add table thead and tbody for object lines 2018-05-17 16:52:16 +02:00
John
b01893d536 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into new_avoir_situation_pull 2018-05-16 15:29:57 +02:00
TuxGasy
12440e6a7e Do not display multicurrency cols if currency of object is same as main currency 2018-05-02 11:30:35 +02:00
Laurent Destailleur
2fc2c44de4 Fix phpcs 2018-04-29 20:18:50 +02:00
Laurent Destailleur
0cdfd6800a Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-04-29 20:11:47 +02:00
Regis Houssin
2906358383 Fix: use "socpeople" instead "societe" 2018-04-27 10:42:10 +02:00
Laurent Destailleur
659fd46b76
Merge pull request #8653 from ATM-Marc/NEW_commonObject_array 
NEW: work on CommonObject 'array' field typeNew common object array
 2018-04-27 09:39:26 +02:00
Laurent Destailleur
9d070cac87 NEW Can add product in supplier order/invoice even w/o predefined price 
Add option SUPPLIER_PROPOSAL_WITH_PREDEFINED_PRICES_ONLY,
SUPPLIER_ORDER_WITH_PREDEFINED_PRICES_ONLY and
SUPPLIER_INVOICE_WITH_PREDEFINED_PRICES_ONLY to restore restricted old
behaviour.
 2018-04-24 12:57:31 +02:00
florian HENRY
67329b8805 fix commonobject double style 2018-04-24 12:33:07 +02:00