Commit Graph

112767 Commits

Author SHA1 Message Date
Laurent Destailleur
421681cda4 FIX Navigation in list of holiday
Conflicts:
	htdocs/holiday/view_log.php
2021-05-26 15:25:44 +02:00
Laurent Destailleur
48945533e4 Clean code 2021-05-26 15:22:56 +02:00
Laurent Destailleur
7c41be7f0a FIX Navigation in list of holiday 2021-05-26 15:22:49 +02:00
Maxime Kohlhaas
b3a6bcd34f Fix Winfic accountancy export for due date 2021-05-26 15:01:31 +02:00
Maxime Kohlhaas
1d5b8cbb19 Fix Quadra accountancy export for due date 2021-05-26 14:59:28 +02:00
Laurent Destailleur
38ef028310 Clean code. Fix check for lot that must be unique. 2021-05-26 12:44:15 +02:00
Francis Appels
ac0bad15de Merge remote-tracking branch 'Dolibarr/develop' into 14 2021-05-26 11:51:49 +02:00
Laurent Destailleur
33db421fb2 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-05-26 11:24:50 +02:00
Laurent Destailleur
ded385f12e FIX #17650 #17710 2021-05-26 11:24:29 +02:00
Laurent Destailleur
2130be975e Fix perm 2021-05-26 11:01:54 +02:00
Laurent Destailleur
83fdc2841a
Merge pull request #17725 from frederic34/patch-7
fix warning
2021-05-26 10:55:47 +02:00
Laurent Destailleur
b3009d39cc
Merge pull request #17724 from frederic34/patch-5
fix warning
2021-05-26 10:55:18 +02:00
Dorian Vabre
fe6b25ede6 fix on $value 2021-05-26 09:48:13 +02:00
Frédéric FRANCE
60196c0417
Update card.php 2021-05-26 08:53:17 +02:00
Frédéric FRANCE
9a51333662
fix warning 2021-05-26 08:49:54 +02:00
Frédéric FRANCE
eec254f066
fix warning 2021-05-26 08:42:35 +02:00
Laurent Destailleur
156279d6a1 Fix nojs 2021-05-26 00:34:52 +02:00
Laurent Destailleur
80c5aa7271
Merge pull request #17722 from frederic34/patch-10
Update api_stockmovements.class.php
2021-05-26 00:31:28 +02:00
Laurent Destailleur
8302ad4490
Merge pull request #17721 from frederic34/patch-9
fix warning
2021-05-26 00:31:03 +02:00
Laurent Destailleur
3e049479c7
Merge pull request #17718 from frederic34/patch-7
fix status/percent
2021-05-26 00:30:33 +02:00
Laurent Destailleur
f839ea9059
Merge pull request #17720 from frederic34/patch-8
fix warning
2021-05-26 00:30:07 +02:00
Laurent Destailleur
27d9606ca8
Merge pull request #17719 from frederic34/patch-5
fix warnings
2021-05-26 00:29:56 +02:00
Frédéric FRANCE
429ebe6662
Update api_stockmovements.class.php 2021-05-25 23:49:49 +02:00
Laurent Destailleur
94c8246f68 Debug v14 2021-05-25 23:30:06 +02:00
Laurent Destailleur
f9d6438bae Debug v14 2021-05-25 23:26:03 +02:00
Frédéric FRANCE
8221011d7d
Update list.php 2021-05-25 23:22:43 +02:00
Frédéric FRANCE
e316437a0e
fix warning 2021-05-25 23:20:55 +02:00
Frédéric FRANCE
4067ac19dc
fix warning 2021-05-25 23:17:34 +02:00
Frédéric FRANCE
1662d4a829
fix warnings 2021-05-25 23:14:36 +02:00
Laurent Destailleur
f252748dbf
Merge pull request #17343 from atm-gauthier/develop_new_collapse_batch_detail
NEW : collapse batch detail
2021-05-25 23:04:50 +02:00
Frédéric FRANCE
9e3de39245
fix status/percent
in sql it is a.datep as dp, not datep
2021-05-25 23:00:21 +02:00
Laurent Destailleur
c75da78a22
Merge pull request #17717 from frederic34/comm_action_card
fix warnings
2021-05-25 22:54:41 +02:00
Laurent Destailleur
a22a659d6e
Merge pull request #17716 from frederic34/patch-5
fix allowed preview
2021-05-25 22:53:28 +02:00
Laurent Destailleur
8576cf1b72 Fix combo when we must no hide value with key -1 2021-05-25 22:51:37 +02:00
Frédéric FRANCE
332d8c9105
fix warnings 2021-05-25 22:24:46 +02:00
Frédéric FRANCE
4c698ce798
Update html.form.class.php 2021-05-25 22:11:30 +02:00
Frédéric FRANCE
c76cf60e15
Update html.form.class.php 2021-05-25 22:09:58 +02:00
Laurent Destailleur
8f9de222c1 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-05-25 21:53:56 +02:00
Laurent Destailleur
9aee8a2a0b FIX #17406 2021-05-25 21:53:44 +02:00
Laurent Destailleur
9b2fb74dca
Merge pull request #17635 from FHenry/fix_13_cyan_salesman_as_note
fix : hidden option MAIN_ADD_CREATOR_IN_NOTE should use dol_concatdesc rather than php concat oparator
2021-05-25 21:40:12 +02:00
Laurent Destailleur
bad90240bc
Update pdf_cyan.modules.php 2021-05-25 21:39:50 +02:00
Laurent Destailleur
2ac9099e7d
Merge pull request #17618 from piernov/12.0-fix-addUserToGroupLDAP
Fix add/del user to group modifies LDAP group
2021-05-25 21:23:17 +02:00
Laurent Destailleur
4b47611e23 Debug v14 2021-05-25 21:21:09 +02:00
Laurent Destailleur
c7a56e3f99
Merge pull request #17690 from Givriz/dev_1
Compatibility phpv8
2021-05-25 20:36:56 +02:00
Laurent Destailleur
714334c585
Merge pull request #17698 from OPEN-DSI/new-translate-order-supplier
NEW translate supplier order menus and button
2021-05-25 20:34:17 +02:00
Laurent Destailleur
988660025a Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-05-25 20:32:42 +02:00
Laurent Destailleur
a09db63c7b Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/accountancy/bookkeeping/balance.php
	htdocs/contrat/list.php
	htdocs/don/class/api_donations.class.php
	htdocs/societe/class/societe.class.php
2021-05-25 20:17:54 +02:00
Laurent Destailleur
98d60870d5 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 2021-05-25 20:12:46 +02:00
Laurent Destailleur
1b5f7b78b5 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 2021-05-25 20:12:34 +02:00
Laurent Destailleur
307c5cb276
Merge pull request #17702 from r3dge/13.0
bug fix : replacing orders by donations and setting required field to…
2021-05-25 20:12:07 +02:00